Changeset 63

Timestamp:

12/10/98 13:54:34 (14 years ago)

Author:

frodo

Message:

Last Kyösti fix, applied a bit differently (about fan_div and
division-by-zero).

Location:

lm-sensors/trunk

Files:

• kernel/chips/gl518sm.c (modified) (1 diff)
• src/gl518sm.c (modified) (1 diff)

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -511 +511 @@
   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)

lm-sensors/trunk/src/gl518sm.c

@@ -511 +511 @@
   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)