[209/264] hwmon: (w83627ehf) Fix broken driver init
From: Greg KH <gregkh@suse.de>
Date: 2011-11-10 04:03:01
Also in:
lkml
3.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guenter Roeck <redacted> commit bfa02b0da66965caf46e441270af87edda4fea14 upstream. 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. Reported-by: Alexander Beregalov <redacted> Tested-by: Alexander Beregalov <redacted> Signed-off-by: Guenter Roeck <redacted> Signed-off-by: Jean Delvare <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/hwmon/w83627ehf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c@@ -1756,12 +1756,15 @@ static inline void __devinit w83627ehf_i 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;