Messages in this thread Patch in this message | | | Date | Wed, 12 Nov 2008 19:49:57 +0100 | From | Samuel Ortiz <> | Subject | Re: [PATCH 2.6.28] mfd: Correct WM8350 I2C return code usage |
| |
Hi Mark,
On Mon, Nov 10, 2008 at 01:41:17PM +0000, Mark Brown wrote: > 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. Shouldnt we fix the accessors behaviour instead ? Currently, that would mean fixing some of the wm8350-core static functions. Slightly bigger patch, but that would keep the i2c interface consistent. What do you think ?
Cheers, Samuel.
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> > --- > drivers/mfd/wm8350-i2c.c | 15 +++++++++++++-- > 1 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c > index 8dfe21b..3e0ce0e 100644 > --- a/drivers/mfd/wm8350-i2c.c > +++ b/drivers/mfd/wm8350-i2c.c > @@ -30,7 +30,12 @@ static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg, > ret = i2c_master_send(wm8350->i2c_client, ®, 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, > -- > 1.5.6.5 >
-- Intel Open Source Technology Centre http://oss.intel.com/
| |