hwmon: (adt7475) Make adt7475_read_word() return errors
[ Upstream commit f196dec6d50abb2e65fb54a0621b2f1b4d922995 ] 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> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
94516f10f3
commit
55aaf8e0d9
1 changed files with 9 additions and 5 deletions
|
@ -274,14 +274,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)
|
||||
|
|
Loading…
Add table
Reference in a new issue