diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2018-08-14 12:07:47 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2018-08-27 02:45:25 +0200 |
| commit | f196dec6d50abb2e65fb54a0621b2f1b4d922995 (patch) | |
| tree | a070eefdd19d2d82cdda32301c6330270c45ebdc /drivers | |
| parent | hwmon: (adt7475) Potential error pointer dereferences (diff) | |
| download | linux-f196dec6d50abb2e65fb54a0621b2f1b4d922995.tar.xz linux-f196dec6d50abb2e65fb54a0621b2f1b4d922995.zip | |
hwmon: (adt7475) Make adt7475_read_word() return errors
The adt7475_read_word() function was meant to return negative error
codes on failure.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/adt7475.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c index 16045149f3db..f4c7516eb989 100644 --- a/drivers/hwmon/adt7475.c +++ b/drivers/hwmon/adt7475.c @@ -302,14 +302,18 @@ static inline u16 volt2reg(int channel, long volt, u8 bypass_attn) return clamp_val(reg, 0, 1023) & (0xff << 2); } -static u16 adt7475_read_word(struct i2c_client *client, int reg) +static int adt7475_read_word(struct i2c_client *client, int reg) { - u16 val; + int val1, val2; - val = i2c_smbus_read_byte_data(client, reg); - val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8); + val1 = i2c_smbus_read_byte_data(client, reg); + if (val1 < 0) + return val1; + val2 = i2c_smbus_read_byte_data(client, reg + 1); + if (val2 < 0) + return val2; - return val; + return val1 | (val2 << 8); } static void adt7475_write_word(struct i2c_client *client, int reg, u16 val) |