From 3b1432c71e5f63091106e969f53563fab27f20e5 Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Thu, 10 Dec 1998 12:54:34 +0000 Subject: [PATCH] =?UTF-8?q?Last=20Ky=C3=B6sti=20fix,=20applied=20a=20bit?= =?UTF-8?q?=20differently=20(about=20fan=5Fdiv=20and=20division-by-zero).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@63 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/gl518sm.c | 8 +++++--- src/gl518sm.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index 8103d201..36080aec 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -510,12 +510,14 @@ void gl518_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { gl518_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr],data->fan_div[nr]); - results[1] = FAN_FROM_REG(data->fan[nr],data->fan_div[nr]); + results[0] = FAN_FROM_REG(data->fan_min[nr], + DIV_FROM_REG(data->fan_div[nr])); + results[1] = FAN_FROM_REG(data->fan[nr],DIV_FROM_REG(data->fan_div[nr])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr] = FAN_TO_REG(results[0],data->fan_div[nr]); + data->fan_min[nr] = FAN_TO_REG(results[0], + DIV_FROM_REG(data->fan_div[nr])); old = gl518_read_value(client,GL518_REG_FAN_LIMIT); if (nr == 0) old = (old & 0x00ff) | (data->fan_min[nr] << 8); diff --git a/src/gl518sm.c b/src/gl518sm.c index 8103d201..36080aec 100644 --- a/src/gl518sm.c +++ b/src/gl518sm.c @@ -510,12 +510,14 @@ void gl518_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { gl518_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr],data->fan_div[nr]); - results[1] = FAN_FROM_REG(data->fan[nr],data->fan_div[nr]); + results[0] = FAN_FROM_REG(data->fan_min[nr], + DIV_FROM_REG(data->fan_div[nr])); + results[1] = FAN_FROM_REG(data->fan[nr],DIV_FROM_REG(data->fan_div[nr])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr] = FAN_TO_REG(results[0],data->fan_div[nr]); + data->fan_min[nr] = FAN_TO_REG(results[0], + DIV_FROM_REG(data->fan_div[nr])); old = gl518_read_value(client,GL518_REG_FAN_LIMIT); if (nr == 0) old = (old & 0x00ff) | (data->fan_min[nr] << 8);