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

Commit 898d8054 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Correct WM8350 I2C return code usage 



The vendor BSP used for the WM8350 development provided an I2C driver
which incorrectly returned zero on succesful sends rather than the
number of transmitted bytes, an error which was then propagated into the
WM8350 I2C accessors.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@openedhand.com>
parent b1ccbdc4

drivers/mfd/wm8350-i2c.c

+13 −2
Original line number Diff line number Diff line
@@ -30,7 +30,12 @@ static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg, 
	ret = i2c_master_send(wm8350->i2c_client, &reg, 1);

	if (ret < 0)

		return ret;

	return i2c_master_recv(wm8350->i2c_client, dest, bytes);

	ret = i2c_master_recv(wm8350->i2c_client, dest, bytes);

	if (ret < 0)

		return ret;

	if (ret != bytes)

		return -EIO;

	return 0;

}



static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,
@@ -38,13 +43,19 @@ static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg, 
{

	/* we add 1 byte for device register */

	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];

	int ret;



	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))

		return -EINVAL;



	msg[0] = reg;

	memcpy(&msg[1], src, bytes);

	return i2c_master_send(wm8350->i2c_client, msg, bytes + 1);

	ret = i2c_master_send(wm8350->i2c_client, msg, bytes + 1);

	if (ret < 0)

		return ret;

	if (ret != bytes + 1)

		return -EIO;

	return 0;

}



static int wm8350_i2c_probe(struct i2c_client *i2c,