Skip to contentSkip to conversation

hwmon: (w83627ehf) fix broken driver init

PATCH Applied Guenter Roeck 2 participants 2 messages Nov 5, 2011 – Nov 6, 2011 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwmon: (w83627ehf) fix broken driver init

Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types) results in kernel panic if data->temp_label was not initialized.
The problem was found with chip W83627DHG-P.

Add check if data->temp->label was set before use.

Based on incomplete patch by Alexander Beregalov.

---
 drivers/hwmon/w83627ehf.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/hwmon/w83627ehf.c +6 -3
index 483cb26..93f5fc7 100644
@@ -1835,12 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
 		diode = 0x70;
 	}
 	for (i = 0; i < 3; i++) {
-		const char *label = data->temp_label[data->temp_src[i]];
+		const char *label = NULL;
+
+		if (data->temp_label)
+			label = data->temp_label[data->temp_src[i]];
 
 		/* Digital source overrides analog type */
-		if (strncmp(label, "PECI", 4) = 0)
+		if (label && strncmp(label, "PECI", 4) = 0)
 			data->temp_type[i] = 6;
-		else if (strncmp(label, "AMD", 3) = 0)
+		else if (label && strncmp(label, "AMD", 3) = 0)
 			data->temp_type[i] = 5;
 		else if ((tmp & (0x02 << i)))
 			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
Signature · 7 lines
1.7.3.1


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Applied
#1 lore raw
Quoted 31 lines · Guenter Roeck

Commit 2265cef2 (hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types) results in kernel panic if data->temp_label was not initialized.
The problem was found with chip W83627DHG-P.

Add check if data->temp->label was set before use.

Based on incomplete patch by Alexander Beregalov.

---
 drivers/hwmon/w83627ehf.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/hwmon/w83627ehf.c +4 -1
index 483cb26..93f5fc7 100644
@@ -1835,12 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
 		diode = 0x70;
 	}
 	for (i = 0; i < 3; i++) {
-		const char *label = data->temp_label[data->temp_src[i]];
+		const char *label = NULL;
+
+		if (data->temp_label)
+			label = data->temp_label[data->temp_src[i]];

drivers/hwmon/w83627ehf.c static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, · line 1849

Quoted 10 lines
drivers/hwmon/w83627ehf.c +2 -2
 
 		/* Digital source overrides analog type */
-		if (strncmp(label, "PECI", 4) = 0)
+		if (label && strncmp(label, "PECI", 4) = 0)
 			data->temp_type[i] = 6;
-		else if (strncmp(label, "AMD", 3) = 0)
+		else if (label && strncmp(label, "AMD", 3) = 0)
 			data->temp_type[i] = 5;
 		else if ((tmp & (0x02 << i)))
 			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;

Applied, thanks.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors