diff options
| author | Kangjie Lu <kjlu@umn.edu> | 2018-12-21 20:10:39 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2018-12-22 00:37:59 +0100 |
| commit | 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315 (patch) | |
| tree | c2c28bd0c63dfda8b188d00492d1fe6d2375f0a5 /drivers/hwmon | |
| parent | hwmon: (lm80) fix a missing check of the status of SMBus read (diff) | |
| download | linux-9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315.tar.xz linux-9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315.zip | |
hwmon: (lm80) fix a missing check of bus read in lm80 probe
In lm80_probe(), if lm80_read_value() fails, it returns a negative
error number which is stored to data->fan[f_min] and will be further
used. We should avoid using the data if the read fails.
The fix checks if lm80_read_value() fails, and if so, returns with the
error number.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/lm80.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c index 04f9df0d2341..0e30fa00204c 100644 --- a/drivers/hwmon/lm80.c +++ b/drivers/hwmon/lm80.c @@ -628,6 +628,7 @@ static int lm80_probe(struct i2c_client *client, struct device *dev = &client->dev; struct device *hwmon_dev; struct lm80_data *data; + int rv; data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL); if (!data) @@ -640,8 +641,14 @@ static int lm80_probe(struct i2c_client *client, lm80_init_client(client); /* A few vars need to be filled upon startup */ - data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1)); - data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2)); + rv = lm80_read_value(client, LM80_REG_FAN_MIN(1)); + if (rv < 0) + return rv; + data->fan[f_min][0] = rv; + rv = lm80_read_value(client, LM80_REG_FAN_MIN(2)); + if (rv < 0) + return rv; + data->fan[f_min][1] = rv; hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, data, lm80_groups); |