diff --git a/CHANGES b/CHANGES index 7b143631..c37a3db0 100644 --- a/CHANGES +++ b/CHANGES @@ -13,14 +13,19 @@ ask CVS about it: for example: cvs diff -r V2-0-0 -r V2-0-1 -u +2.1.2 (199801??) + Modules lm80.o, w83781d.o: fan-related Segmentation fault corrected + 2.1.1 (19990107) Module i2c-proc.o: Hack to make /proc/bus/ possible for kernels 2.0.35 and older Module gl518sm.o: Miscelaneous bugs and problems solved + Program isadump: NEW 2.1.0 (19981230) Library: Completely NEW Program sensors: NEW + Program grab_busses: NEW Program decode-dimms: More information Module bit-mb.o: Removed spurious semicolon; now runs on more VIA chipsets Module w83781d.o: NEW diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c index 72ba020e..97644aa9 100644 --- a/kernel/chips/lm80.c +++ b/kernel/chips/lm80.c @@ -548,12 +548,15 @@ void lm80_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { lm80_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]); - results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]); + results[0] = FAN_FROM_REG(data->fan_min[nr-1], + DIV_FROM_REG(data->fan_div[nr-1])); + results[1] = FAN_FROM_REG(data->fan[nr-1], + DIV_FROM_REG(data->fan_div[nr-1])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]); + data->fan_min[nr-1] = FAN_TO_REG(results[0], + DIV_FROM_REG(data->fan_div[nr-1])); lm80_write_value(client,nr==1?LM80_REG_FAN1_MIN:LM80_REG_FAN2_MIN, data->fan_min[nr-1]); } diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index f2c8fd27..2f0ecced 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -915,12 +915,15 @@ void w83781d_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { w83781d_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]); - results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]); + results[0] = FAN_FROM_REG(data->fan_min[nr-1], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); + results[1] = FAN_FROM_REG(data->fan[nr-1], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]); + data->fan_min[nr-1] = FAN_TO_REG(results[0], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); w83781d_write_value(client,W83781D_REG_FAN_MIN(nr),data->fan_min[nr-1]); } } diff --git a/src/lm80.c b/src/lm80.c index 72ba020e..97644aa9 100644 --- a/src/lm80.c +++ b/src/lm80.c @@ -548,12 +548,15 @@ void lm80_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { lm80_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]); - results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]); + results[0] = FAN_FROM_REG(data->fan_min[nr-1], + DIV_FROM_REG(data->fan_div[nr-1])); + results[1] = FAN_FROM_REG(data->fan[nr-1], + DIV_FROM_REG(data->fan_div[nr-1])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]); + data->fan_min[nr-1] = FAN_TO_REG(results[0], + DIV_FROM_REG(data->fan_div[nr-1])); lm80_write_value(client,nr==1?LM80_REG_FAN1_MIN:LM80_REG_FAN2_MIN, data->fan_min[nr-1]); } diff --git a/src/w83781d.c b/src/w83781d.c index f2c8fd27..2f0ecced 100644 --- a/src/w83781d.c +++ b/src/w83781d.c @@ -915,12 +915,15 @@ void w83781d_fan(struct i2c_client *client, int operation, int ctl_name, *nrels_mag = 0; else if (operation == SENSORS_PROC_REAL_READ) { w83781d_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]); - results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]); + results[0] = FAN_FROM_REG(data->fan_min[nr-1], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); + results[1] = FAN_FROM_REG(data->fan[nr-1], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); *nrels_mag = 2; } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]); + data->fan_min[nr-1] = FAN_TO_REG(results[0], + FAN_DIV_FROM_REG(data->fan_div[nr-1])); w83781d_write_value(client,W83781D_REG_FAN_MIN(nr),data->fan_min[nr-1]); } }