Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccd9e42 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarTokunori Ikegami <ikegami@allied-telesis.co.jp>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc63de90

drivers/hwmon/adt7475.c

+9 −5
Original line number Diff line number Diff line
@@ -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)