Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294805
b: refs/heads/master
c: bb79a07
h: refs/heads/master
i:
  294803: 7cda897
v: v3
  • Loading branch information
Oskar Schirmer authored and Wolfram Sang committed Feb 29, 2012
1 parent c2392b4 commit 33a5b9f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 104522806a7d9d47c34f425dee2bcd7f1ee5613e
refs/heads/master: bb79a0798d7c430f012f2f906fd7873f8976bc89
5 changes: 0 additions & 5 deletions trunk/drivers/i2c/busses/i2c-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
break;
if (!for_busy && !(temp & I2SR_IBB))
break;
if (signal_pending(current)) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> I2C Interrupted\n", __func__);
return -EINTR;
}
if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> I2C bus is busy\n", __func__);
Expand Down

0 comments on commit 33a5b9f

Please sign in to comment.