diff options
author | Zev Weiss <zev@bewilderbeest.net> | 2023-01-03 00:28:57 +0300 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2023-01-04 00:26:45 +0300 |
commit | 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a (patch) | |
tree | b12d2e3a69bdd44f3220d8b64a647cefcda529b5 /drivers/hwmon/nct6775-core.c | |
parent | ca8fd8c16a8b77dfcf7f6ce52d2c863220693a78 (diff) | |
download | linux-2fbb848b65cde5b876cce52ebcb34de4aaa5a94a.tar.xz |
hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()
Commit 4ef2774511dc ("hwmon: (nct6775) Convert register access to
regmap API") fumbled the shifting & masking of the fan_div values such
that odd-numbered fan divisors would always be set to zero. Fix it so
that we actually OR in the bits we meant to.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Fixes: 4ef2774511dc ("hwmon: (nct6775) Convert register access to regmap API")
Cc: stable@kernel.org # v5.19+
Link: https://lore.kernel.org/r/20230102212857.5670-1-zev@bewilderbeest.net
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/nct6775-core.c')
-rw-r--r-- | drivers/hwmon/nct6775-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c index da9ec6983e13..c54233f0369b 100644 --- a/drivers/hwmon/nct6775-core.c +++ b/drivers/hwmon/nct6775-core.c @@ -1150,7 +1150,7 @@ static int nct6775_write_fan_div(struct nct6775_data *data, int nr) if (err) return err; reg &= 0x70 >> oddshift; - reg |= data->fan_div[nr] & (0x7 << oddshift); + reg |= (data->fan_div[nr] & 0x7) << oddshift; return nct6775_write_value(data, fandiv_reg, reg); } |