Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-08-16 22:01:45 +0200
committerJiri Slaby <jslaby@suse.cz>2019-08-16 22:25:11 +0200
commitdb9a9dabd8a9884bb74f715ba493a215cc750d24 (patch)
treef9da7de561a03644961ef0b2cdd052267f600802
parent2bd4a22fae988f9a3a39ca1eecb357e546e0aa4f (diff)
hwmon: (nct7802) Fix wrong detection of in4 presence
-rw-r--r--patches.kernel.org/5.2.9-123-hwmon-nct7802-Fix-wrong-detection-of-in4-presen.patch61
-rw-r--r--series.conf1
2 files changed, 62 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.9-123-hwmon-nct7802-Fix-wrong-detection-of-in4-presen.patch b/patches.kernel.org/5.2.9-123-hwmon-nct7802-Fix-wrong-detection-of-in4-presen.patch
new file mode 100644
index 0000000000..c3bb79d4b0
--- /dev/null
+++ b/patches.kernel.org/5.2.9-123-hwmon-nct7802-Fix-wrong-detection-of-in4-presen.patch
@@ -0,0 +1,61 @@
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Fri, 26 Jul 2019 08:00:49 -0700
+Subject: [PATCH] hwmon: (nct7802) Fix wrong detection of in4 presence
+References: bnc#1012628
+Patch-mainline: 5.2.9
+Git-commit: 38ada2f406a9b81fb1249c5c9227fa657e7d5671
+
+commit 38ada2f406a9b81fb1249c5c9227fa657e7d5671 upstream.
+
+The code to detect if in4 is present is wrong; if in4 is not present,
+the in4_input sysfs attribute is still present.
+
+In detail:
+
+- Ihen RTD3_MD=11 (VSEN3 present), everything is as expected (no bug).
+- If we have RTD3_MD!=11 (no VSEN3), we unexpectedly have a in4_input
+ file under /sys and the "sensors" command displays in4_input.
+ But as expected, we have no in4_min, in4_max, in4_alarm, in4_beep.
+
+Fix is_visible function to detect and report in4_input visibility
+as expected.
+
+Reported-by: Gilles Buloz <Gilles.Buloz@kontron.com>
+Cc: Gilles Buloz <Gilles.Buloz@kontron.com>
+Cc: stable@vger.kernel.org
+Fixes: 3434f37835804 ("hwmon: Driver for Nuvoton NCT7802Y")
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/hwmon/nct7802.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/hwmon/nct7802.c b/drivers/hwmon/nct7802.c
+index ec7bcf8d7cd6..f3dd2a17bd42 100644
+--- a/drivers/hwmon/nct7802.c
++++ b/drivers/hwmon/nct7802.c
+@@ -704,7 +704,7 @@ static struct attribute *nct7802_in_attrs[] = {
+ &sensor_dev_attr_in3_alarm.dev_attr.attr,
+ &sensor_dev_attr_in3_beep.dev_attr.attr,
+
+- &sensor_dev_attr_in4_input.dev_attr.attr, /* 17 */
++ &sensor_dev_attr_in4_input.dev_attr.attr, /* 16 */
+ &sensor_dev_attr_in4_min.dev_attr.attr,
+ &sensor_dev_attr_in4_max.dev_attr.attr,
+ &sensor_dev_attr_in4_alarm.dev_attr.attr,
+@@ -730,9 +730,9 @@ static umode_t nct7802_in_is_visible(struct kobject *kobj,
+
+ if (index >= 6 && index < 11 && (reg & 0x03) != 0x03) /* VSEN1 */
+ return 0;
+- if (index >= 11 && index < 17 && (reg & 0x0c) != 0x0c) /* VSEN2 */
++ if (index >= 11 && index < 16 && (reg & 0x0c) != 0x0c) /* VSEN2 */
+ return 0;
+- if (index >= 17 && (reg & 0x30) != 0x30) /* VSEN3 */
++ if (index >= 16 && (reg & 0x30) != 0x30) /* VSEN3 */
+ return 0;
+
+ return attr->mode;
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index ae3d7a20cd..b6544dda7e 100644
--- a/series.conf
+++ b/series.conf
@@ -1143,6 +1143,7 @@
patches.kernel.org/5.2.9-120-KVM-nSVM-properly-map-nested-VMCB.patch
patches.kernel.org/5.2.9-121-can-peak_usb-pcan_usb_pro-Fix-info-leaks-to-USB.patch
patches.kernel.org/5.2.9-122-can-peak_usb-pcan_usb_fd-Fix-info-leaks-to-USB-.patch
+ patches.kernel.org/5.2.9-123-hwmon-nct7802-Fix-wrong-detection-of-in4-presen.patch
########################################################
# Build fixes that apply to the vanilla kernel too.