From: Zhouyang Jia <jiazhouyang09@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Zhouyang Jia <jiazhouyang09@gmail.com>,
Rudolf Marek <r.marek@assembler.cz>,
Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] hwmon: (w83793) add error handling for i2c_new_dummy
Date: Tue, 12 Jun 2018 11:32:59 +0800 [thread overview]
Message-ID: <1528774379-38587-1-git-send-email-jiazhouyang09@gmail.com> (raw)
When i2c_new_dummy fails, the lack of error-handling code may
cause unexpected results.
This patch adds error-handling code after calling i2c_new_dummy.
Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
---
drivers/hwmon/w83793.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 0af0f62..4aa3a0e 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1603,8 +1603,15 @@ w83793_detect_subclients(struct i2c_client *client)
}
tmp = w83793_read_value(client, W83793_REG_I2C_SUBADDR);
- if (!(tmp & 0x08))
+ if (!(tmp & 0x08)) {
data->lm75[0] = i2c_new_dummy(adapter, 0x48 + (tmp & 0x7));
+ if (data->lm75[0] == NULL) {
+ dev_err(&client->dev,
+ "Failed to allocate I2C device\n");
+ err = -ENODEV;
+ goto ERROR_SC_1;
+ }
+ }
if (!(tmp & 0x80)) {
if ((data->lm75[0] != NULL)
&& ((tmp & 0x7) == ((tmp >> 4) & 0x7))) {
@@ -1616,6 +1623,12 @@ w83793_detect_subclients(struct i2c_client *client)
}
data->lm75[1] = i2c_new_dummy(adapter,
0x48 + ((tmp >> 4) & 0x7));
+ if (data->lm75[1] == NULL) {
+ dev_err(&client->dev,
+ "Failed to allocate I2C device\n");
+ err = -ENODEV;
+ goto ERROR_SC_1;
+ }
}
return 0;
--
2.7.4
next reply other threads:[~2018-06-12 3:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 3:32 Zhouyang Jia [this message]
2018-06-12 13:21 ` Guenter Roeck
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=1528774379-38587-1-git-send-email-jiazhouyang09@gmail.com \
--to=jiazhouyang09@gmail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=r.marek@assembler.cz \
/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
all inboxes | Powered by JetHome®