diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2023-01-03 00:28:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-10 11:34:23 +0300 |
| commit | 688ae6ce05bebf4ec46ccf55ccb537e8225d1f36 (patch) | |
| tree | 73265f1ff7ea8406c83a99ed3ed6c6731c53ddd8 /drivers/hwmon/nct6775-core.c | |
| parent | 57c07e552e0dd3fb1b663d3e87ce22dcb65bd8df (diff) | |
| download | linux-688ae6ce05bebf4ec46ccf55ccb537e8225d1f36.tar.xz | |
hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()
commit 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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); } |