diff options
| author | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /drivers/hwmon/it87.c | |
| parent | Merge branches 'regulator-core', 'regulator-dt' and 'regulator-dummy' into re... (diff) | |
| parent | regulator: add new lp8788 regulator driver (diff) | |
| download | kernel-3384fb98845dc014770caa224d61a2effd258ca5.tar.gz kernel-3384fb98845dc014770caa224d61a2effd258ca5.zip | |
Merge branch 'regulator-drivers' into regulator-next
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)); } |