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.

Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Tested-by: Alexander Beregalov <a.beregalov@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Guenter Roeck 2011-11-06 20:25:18 +01:00 коммит произвёл Jean Delvare
Родитель 2aba6cac2a
Коммит bfa02b0da6
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -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;