Skip to content

Commit

Permalink
Merge tag 'hwmon-for-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Feb 13, 2019
2 parents 57902dc + 2a2ec4a commit 991b9eb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/hwmon/nct6775.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 991b9eb

Please sign in to comment.