system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon: (adt7475) Make adt7475_read_word() return errors

Browse source 
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>
This commit is contained in:
Dan Carpenter 2018-08-14 13:07:47 +03:00 committed by Guenter Roeck
parent 9d19371df5
commit f196dec6d5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/hwmon/adt7475.c
View file

@ -302,14 +302,18 @@ static inline u16 volt2reg(int channel, long volt, u8 bypass_attn)
return clamp_val(reg, 0, 1023) & (0xff << 2); 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); val1 = i2c_smbus_read_byte_data(client, reg);
val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8); 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) static void adt7475_write_word(struct i2c_client *client, int reg, u16 val)