* [PATCH] hwmon: (w83791d) add error handling for i2c_new_dummy
@ 2018-06-12 3:35 Zhouyang Jia
2018-06-12 13:21 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Zhouyang Jia @ 2018-06-12 3:35 UTC (permalink / raw)
Cc: Zhouyang Jia, Marc Hulsman, Jean Delvare, Guenter Roeck,
linux-hwmon, linux-kernel
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/w83791d.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 28fa3bd..a183432 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -1295,8 +1295,15 @@ static int w83791d_detect_subclients(struct i2c_client *client)
}
val = w83791d_read(client, W83791D_REG_I2C_SUBADDR);
- if (!(val & 0x08))
+ if (!(val & 0x08)) {
data->lm75[0] = i2c_new_dummy(adapter, 0x48 + (val & 0x7));
+ if (data->lm75[0] == NULL) {
+ dev_err(&client->dev,
+ "Failed to allocate I2C device\n");
+ err = -ENODEV;
+ goto error_sc_1;
+ }
+ }
if (!(val & 0x80)) {
if ((data->lm75[0] != NULL) &&
((val & 0x7) == ((val >> 4) & 0x7))) {
@@ -1309,6 +1316,12 @@ static int w83791d_detect_subclients(struct i2c_client *client)
}
data->lm75[1] = i2c_new_dummy(adapter,
0x48 + ((val >> 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] hwmon: (w83791d) add error handling for i2c_new_dummy
2018-06-12 3:35 [PATCH] hwmon: (w83791d) add error handling for i2c_new_dummy Zhouyang Jia
@ 2018-06-12 13:21 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2018-06-12 13:21 UTC (permalink / raw)
To: Zhouyang Jia; +Cc: Marc Hulsman, Jean Delvare, linux-hwmon, linux-kernel
On 06/11/2018 08:35 PM, Zhouyang Jia wrote:
> 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>
As before, NACK, sorry.
Guenter
> ---
> drivers/hwmon/w83791d.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
> index 28fa3bd..a183432 100644
> --- a/drivers/hwmon/w83791d.c
> +++ b/drivers/hwmon/w83791d.c
> @@ -1295,8 +1295,15 @@ static int w83791d_detect_subclients(struct i2c_client *client)
> }
>
> val = w83791d_read(client, W83791D_REG_I2C_SUBADDR);
> - if (!(val & 0x08))
> + if (!(val & 0x08)) {
> data->lm75[0] = i2c_new_dummy(adapter, 0x48 + (val & 0x7));
> + if (data->lm75[0] == NULL) {
> + dev_err(&client->dev,
> + "Failed to allocate I2C device\n");
> + err = -ENODEV;
> + goto error_sc_1;
> + }
> + }
> if (!(val & 0x80)) {
> if ((data->lm75[0] != NULL) &&
> ((val & 0x7) == ((val >> 4) & 0x7))) {
> @@ -1309,6 +1316,12 @@ static int w83791d_detect_subclients(struct i2c_client *client)
> }
> data->lm75[1] = i2c_new_dummy(adapter,
> 0x48 + ((val >> 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;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-12 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-12 3:35 [PATCH] hwmon: (w83791d) add error handling for i2c_new_dummy Zhouyang Jia
2018-06-12 13:21 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).