Commit ac7d181e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Please pull one hwmon subsystem fix from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (it87) Preserve configuration register bits on init
parents 4264e6a2 41002f8d

drivers/hwmon/it87.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}