Commit 991b9eb4 authored Feb 12, 2019 by Linus Torvalds

Merge tag 'hwmon-for-v5.0-rc7' of...

Merge tag 'hwmon-for-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix fan detection for NCT6793D"

* tag 'hwmon-for-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Fix fan6 detection for NCT6793D

parents 57902dc0 2a2ec4aa

drivers/hwmon/nct6775.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3594,7 +3594,8 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
		fan5pin \|= cr1b & BIT(5);
		fan5pin \|= creb & BIT(5);

		fan6pin = creb & BIT(3);
		fan6pin = !dsw_en && (cr2d & BIT(1));
		fan6pin \|= creb & BIT(3);

		pwm5pin \|= cr2d & BIT(7);
		pwm5pin \|= (creb & BIT(4)) && !(cr2a & BIT(0));

Admin message