summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2012-07-12 22:47:37 +0200
committerJean Delvare <khali@endymion.delvare>2012-07-12 22:47:37 +0200
commit41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 (patch)
treec09ffb6978413522cc37987a6fdf1bdb19ef6859 /drivers
parent918227bb1b59444a2c467711fd50cc22bb4a897b (diff)
downloadlinux-3.10-41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8.tar.gz
linux-3.10-41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8.tar.bz2
linux-3.10-41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8.zip
hwmon: (it87) Preserve configuration register bits on init
We were accidentally losing one bit in the configuration register on device initialization. It was reported to freeze one specific system right away. Properly preserve all bits we don't explicitly want to change in order to prevent that. Reported-by: Stevie Trujillo <stevie.trujillo@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/it87.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index e7701d99f8e..f1de3979181 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -2341,7 +2341,7 @@ static void __devinit it87_init_device(struct platform_device *pdev)
/* Start monitoring */
it87_write_value(data, IT87_REG_CONFIG,
- (it87_read_value(data, IT87_REG_CONFIG) & 0x36)
+ (it87_read_value(data, IT87_REG_CONFIG) & 0x3e)
| (update_vbat ? 0x41 : 0x01));
}