Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347058
b: refs/heads/master
c: 27e0fbe
h: refs/heads/master
v: v3
  • Loading branch information
Wolfram Sang authored and Wolfram Sang committed Nov 14, 2012
1 parent b3384ac commit 5283b29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: ca85e248b65649176e9e1edfbf5e791bc44ee52b
refs/heads/master: 27e0fbefa5ddebdd681d2be9824302d14494c5ff
3 changes: 1 addition & 2 deletions trunk/drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1291,14 +1291,13 @@ static int omap_i2c_runtime_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct omap_i2c_dev *_dev = platform_get_drvdata(pdev);
u16 iv;

_dev->iestate = omap_i2c_read_reg(_dev, OMAP_I2C_IE_REG);

omap_i2c_write_reg(_dev, OMAP_I2C_IE_REG, 0);

if (_dev->rev < OMAP_I2C_OMAP1_REV_2) {
iv = omap_i2c_read_reg(_dev, OMAP_I2C_IV_REG); /* Read clears */
omap_i2c_read_reg(_dev, OMAP_I2C_IV_REG); /* Read clears */
} else {
omap_i2c_write_reg(_dev, OMAP_I2C_STAT_REG, _dev->iestate);

Expand Down

0 comments on commit 5283b29

Please sign in to comment.