summaryrefslogtreecommitdiff
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorAlejandro Gonzalez <alex.gonzalez@digi.com>2010-01-20 13:59:11 +0100
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-02-12 18:31:09 +0100
commit4dd20f06b0a28f922787c1d146a8742c3962b9bf (patch)
treec72a8ba00621473988fc76e76f8f11767d3702f6 /drivers/i2c/busses
parent39c8a74044e80fa56e3265f54ed96ad4038f89e0 (diff)
ccwmx51: Support for the I2C2 bus.
Register the mma7455l accelerometer chip with the I2C2 bus and add a client driver for the mma7455l device. The chip is probed and I2C R/W transactions are working. No other test on the mma7455l driver has been performed at this stage. Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/mxc_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/mxc_i2c.c b/drivers/i2c/busses/mxc_i2c.c
index 8bada57c1c82..655be65d0810 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 -EBUSY;
+ return;
}
writew(addr_trans, dev->membase + MXC_I2DR);
return 0;