From: Guenter Roeck <guenter.roeck@ericsson.com>
To: Jean Delvare <khali@linux-fr.org>
Cc: Alexander Beregalov <a.beregalov@gmail.com>,
<lm-sensors@lm-sensors.org>, <linux-kernel@vger.kernel.org>,
Guenter Roeck <guenter.roeck@ericsson.com>,
Jean Delvare <khali@linux-fr.org>, <stable@kernel.org>
Subject: [PATCH] hwmon: (w83627ehf) fix broken driver init
Date: Sat, 5 Nov 2011 07:43:43 -0700 [thread overview]
Message-ID: <1320504223-28764-1-git-send-email-guenter.roeck@ericsson.com> (raw)
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: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
---
drivers/hwmon/w83627ehf.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 483cb26..93f5fc7 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -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;
--
1.7.3.1
next reply other threads:[~2011-11-05 14:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-05 14:43 Guenter Roeck [this message]
2011-11-06 12:02 ` Jean Delvare
-- strict thread matches above, loose matches on Subject: below --
2011-11-05 0:54 [PATCH] hwmon: (w83627ehf): " Alexander Beregalov
2011-11-05 1:12 ` Guenter Roeck
2011-11-05 4:51 ` Guenter Roeck
2011-11-05 8:13 ` Jean Delvare
2011-11-05 14:38 ` Guenter Roeck
2011-11-05 12:08 ` Alexander Beregalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320504223-28764-1-git-send-email-guenter.roeck@ericsson.com \
--to=guenter.roeck@ericsson.com \
--cc=a.beregalov@gmail.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome