diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2012-07-12 22:47:37 +0200 |
|---|---|---|
| committer |   Jean Delvare <khali@endymion.delvare> | 2012-07-12 22:47:37 +0200 |
| commit | 41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 (patch) | |
| tree | c09ffb6978413522cc37987a6fdf1bdb19ef6859 /drivers/hwmon/it87.c | |
| parent | Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-dev-41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8.tar.xz linux-dev-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/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 e7701d99f8e8..f1de3979181f 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)); } |