diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-12 16:29:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-12 16:29:33 -0800 |
| commit | 991b9eb4243b53e6dcaeda94e515d713ca7ddd2e (patch) | |
| tree | 70c4967b9f57bfe6e6d4c367d8f52fa893a15f59 /drivers | |
| parent | 57902dc0670c2926b0b5cc93a1e2ddf09d53e706 (diff) | |
| parent | 2a2ec4aa0577ec0b7df2d1bde5c84ed39a8637cb (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/nct6775.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 4adec4ab7d06..59ee01f3d022 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -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)); |