diff options
| author | Jean Delvare <khali@linux-fr.org> | 2012-07-12 22:47:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 08:58:55 -0700 |
| commit | 175063bccaefa0b6a4934ffaf3a9639a4a7616d0 (patch) | |
| tree | 2f48e7b11eea3501b0585824ad15ad0feccc9dc8 /drivers/hwmon/it87.c | |
| parent | 9ab2f39f3ebbd4ccf2cdd75d564ee09c77c722ab (diff) | |
| download | linux-3.10-175063bccaefa0b6a4934ffaf3a9639a4a7616d0.tar.gz linux-3.10-175063bccaefa0b6a4934ffaf3a9639a4a7616d0.tar.bz2 linux-3.10-175063bccaefa0b6a4934ffaf3a9639a4a7616d0.zip | |
hwmon: (it87) Preserve configuration register bits on init
commit 41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 upstream.
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>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 0b204e4cf51..f524882aaeb 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -2157,7 +2157,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)); } |