diff options
author | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-26 13:32:19 +0200 |
---|---|---|
committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-26 13:32:19 +0200 |
commit | 566834514389a8939cbbc3c37961555da33e8be1 (patch) | |
tree | ae830108e2c702faa4dd0ef1cf5d857587faa319 /drivers/i2c | |
parent | e749e37adf1735c5a0b3bc5262cb542995ce42e9 (diff) |
ccwmx51: Compare with FSL official L2.6.31_10.04.01 source tree
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/mxc_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/mxc_i2c.c b/drivers/i2c/busses/mxc_i2c.c index c994c56da665..2ecec62aeabe 100644 --- a/drivers/i2c/busses/mxc_i2c.c +++ b/drivers/i2c/busses/mxc_i2c.c @@ -261,7 +261,7 @@ static int mxc_i2c_repstart(mxc_i2c_device *dev, struct i2c_msg *msg) } if (retry <= 0) { dev_err(&dev->adap.dev, "Could not grab Bus ownership\n"); - return -1; + return -EBUSY; } writew(addr_trans, dev->membase + MXC_I2DR); return 0; |