summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2011-01-12 22:24:36 +0000
committerBen Dooks <ben-linux@fluff.org>2011-01-12 22:24:36 +0000
commit7f42f9fef7bbc4f3250a33bf58170c640cd3db18 (patch)
tree1414676d0fa9a4d51bfb95bbb758f6141657f907 /drivers/i2c
parentcc3feac34617ec685551905507cd8d909be6431f (diff)
parent6a91b558648cffa94227b4ff9c6c996930bbdfd2 (diff)
downloadop-kernel-dev-7f42f9fef7bbc4f3250a33bf58170c640cd3db18.zip
op-kernel-dev-7f42f9fef7bbc4f3250a33bf58170c640cd3db18.tar.gz
Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 9d09083..b605ff3 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -598,12 +598,8 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
* REVISIT: We should abort the transfer on signals, but the bus goes
* into arbitration and we're currently unable to recover from it.
*/
- if (dev->set_mpu_wkup_lat != NULL)
- dev->set_mpu_wkup_lat(dev->dev, dev->latency);
r = wait_for_completion_timeout(&dev->cmd_complete,
OMAP_I2C_TIMEOUT);
- if (dev->set_mpu_wkup_lat != NULL)
- dev->set_mpu_wkup_lat(dev->dev, -1);
dev->buf_len = 0;
if (r < 0)
return r;
@@ -654,12 +650,18 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
if (r < 0)
goto out;
+ if (dev->set_mpu_wkup_lat != NULL)
+ dev->set_mpu_wkup_lat(dev->dev, dev->latency);
+
for (i = 0; i < num; i++) {
r = omap_i2c_xfer_msg(adap, &msgs[i], (i == (num - 1)));
if (r != 0)
break;
}
+ if (dev->set_mpu_wkup_lat != NULL)
+ dev->set_mpu_wkup_lat(dev->dev, -1);
+
if (r == 0)
r = num;
OpenPOWER on IntegriCloud