Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272425
b: refs/heads/master
c: 6314f09
h: refs/heads/master
i:
  272423: 2135a89
v: v3
  • Loading branch information
Andy Green authored and Ben Dooks committed Oct 29, 2011
1 parent cd62d45 commit 3effcf1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: a1295577773d9756b65972be7b462e4382996d08
refs/heads/master: 6314f09e9517ed3d7d951525a111df858a6dd1a4
2 changes: 1 addition & 1 deletion trunk/drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
pdata = pdev->dev.platform_data;

dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
if (dev->rev >= OMAP_I2C_REV_ON_4430)
if (pdata->rev == OMAP_I2C_IP_VERSION_2)
omap_i2c_write_reg(dev, OMAP_I2C_IP_V2_IRQENABLE_CLR, 1);
else
omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
Expand Down

0 comments on commit 3effcf1

Please sign in to comment.