diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 18:21:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 18:21:05 -0700 |
| commit | 62f1b494d82272819570d715eb6633887a9fde20 (patch) | |
| tree | 014e6aa79a4c7211dce4b22c781cf23fdd2cc00c | |
| parent | 8b15575cae7a93a784c3005c42b069edd9ba64dd (diff) | |
| parent | 5c64eb26ed5c5550fbabd345e573af3fc6a7f775 (diff) | |
| download | linux-3.10-62f1b494d82272819570d715eb6633887a9fde20.tar.gz linux-3.10-62f1b494d82272819570d715eb6633887a9fde20.tar.bz2 linux-3.10-62f1b494d82272819570d715eb6633887a9fde20.zip | |
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-omap: Make sure i2c bus is free before setting it to idle
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 7674efb5537..b33c78586bf 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -680,6 +680,8 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) if (r == 0) r = num; + + omap_i2c_wait_for_bb(dev); out: omap_i2c_idle(dev); return r; |