summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Xiaodong <B39117@freescale.com>2012-12-12 15:45:54 +0800
committerTapani <tapani@vmail.me>2013-03-29 11:14:25 +0800
commit69f7ac771ff216c7483d7237065ee835c81a22fb (patch)
treeab7c7e440dd4d6f9fe8e47538678f8037717b88b
parenta0b2354c2a5f7a30773ec05f9a41e1838c7d02a8 (diff)
ENGR00235370-4 pmic: Fix the bug of pmic I2C
Fix the bug of wm831x pmic I2C Signed-off-by: Zhang Xiaodong <B39117@freescale.com> Acked-by: Lily Zhang
-rwxr-xr-x[-rw-r--r--]drivers/mfd/wm831x-i2c.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index a06cbc739716..7a4f998776f2 100644..100755
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -53,23 +53,21 @@ static int wm831x_i2c_write_device(struct wm831x *wm831x, unsigned short reg,
struct i2c_client *i2c = wm831x->control_data;
struct i2c_msg xfer[2];
int ret;
+ char buf_to_write[4];
reg = cpu_to_be16(reg);
+ memcpy( buf_to_write, &reg, 2);
+ memcpy( buf_to_write + 2, src, 2);
xfer[0].addr = i2c->addr;
xfer[0].flags = 0;
- xfer[0].len = 2;
- xfer[0].buf = (char *)&reg;
+ xfer[0].len = 4;
+ xfer[0].buf = buf_to_write;
- xfer[1].addr = i2c->addr;
- xfer[1].flags = I2C_M_NOSTART;
- xfer[1].len = bytes;
- xfer[1].buf = (char *)src;
-
- ret = i2c_transfer(i2c->adapter, xfer, 2);
+ ret = i2c_transfer(i2c->adapter, xfer, 1);
if (ret < 0)
return ret;
- if (ret != 2)
+ if (ret != 1)
return -EIO;
return 0;