Commit 2fbb848b authored by Zev Weiss's avatar Zev Weiss Committed by Guenter Roeck

hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()

Commit 4ef27745 ("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: default avatarZev Weiss <zev@bewilderbeest.net>
Fixes: 4ef27745 ("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.netSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent ca8fd8c1
...@@ -1150,7 +1150,7 @@ static int nct6775_write_fan_div(struct nct6775_data *data, int nr) ...@@ -1150,7 +1150,7 @@ static int nct6775_write_fan_div(struct nct6775_data *data, int nr)
if (err) if (err)
return err; return err;
reg &= 0x70 >> oddshift; 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); return nct6775_write_value(data, fandiv_reg, reg);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment