summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorHans de Goede <j.w.r.degoede@hhs.nl>2007-07-22 20:15:31 +0200
committerMark M. Hoffman <mhoffman@lightlink.com>2007-07-30 21:08:38 -0400
commit794f5434942614e5e8f70b9d65b9275e11ad1510 (patch)
tree61ea8b370174226bd9e535110b2d254cdc2db269 /drivers/hwmon
parentc0f31403fe87cd2813dabb9b33107ceb56b84667 (diff)
downloadlinux-794f5434942614e5e8f70b9d65b9275e11ad1510.tar.gz
linux-794f5434942614e5e8f70b9d65b9275e11ad1510.tar.bz2
linux-794f5434942614e5e8f70b9d65b9275e11ad1510.zip
hwmon: fscher control update bugfix
Here is another small fscher bugfix for 2.6.23 merging, this was caught by Jean while reviewing my other bugfix. The driver was updating its copy of the control register as if it was clear to write, but its regular read/write. This patch fixes this. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/fscher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 19717752cfca..f3aa188a5d50 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -599,7 +599,7 @@ static ssize_t set_control(struct i2c_client *client, struct fscher_data *data,
unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01;
mutex_lock(&data->update_lock);
- data->global_control &= ~v;
+ data->global_control = v;
fscher_write_value(client, reg, v);
mutex_unlock(&data->update_lock);
return count;