This is a note to let you know that I've just added the patch titled
hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hwmon-nct6775-fix-incorrect-parenthesization-in-nct6775_write_fan_div.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a Mon Sep 17 00:00:00 2001
From: Zev Weiss <zev@xxxxxxxxxxxxxxxxx>
Date: Mon, 2 Jan 2023 13:28:57 -0800
Subject: hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()
From: Zev Weiss <zev@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Fixes: 4ef2774511dc ("hwmon: (nct6775) Convert register access to regmap API")
Cc: stable@xxxxxxxxxx # v5.19+
Link: https://lore.kernel.org/r/20230102212857.5670-1-zev@xxxxxxxxxxxxxxxxx
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/nct6775-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
}
--
2.39.2
Patches currently in stable-queue which might be from zev@xxxxxxxxxxxxxxxxx are
queue-6.1/hwmon-peci-cputemp-fix-off-by-one-in-coretemp_label-allocation.patch
queue-6.1/hwmon-nct6775-fix-incorrect-parenthesization-in-nct6775_write_fan_div.patch
