Browse Source

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
Linus Torvalds 15 years ago
parent
commit
62f1b494d8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      drivers/i2c/busses/i2c-omap.c

+ 2 - 0
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;