Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347072
b: refs/heads/master
c: 1ab3604
h: refs/heads/master
v: v3
  • Loading branch information
Shubhrajyoti D authored and Wolfram Sang committed Nov 16, 2012
1 parent d2e2e6d commit 6a77bc0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: 06e9eff129ec4251e5335ecaebe1aabba78091b6
refs/heads/master: 1ab3604595af478e9feea430318c22899015550c
7 changes: 4 additions & 3 deletions trunk/drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -654,13 +654,14 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
break;
}

if (dev->set_mpu_wkup_lat != NULL)
dev->set_mpu_wkup_lat(dev->dev, -1);

if (r == 0)
r = num;

omap_i2c_wait_for_bb(dev);

if (dev->set_mpu_wkup_lat != NULL)
dev->set_mpu_wkup_lat(dev->dev, -1);

out:
pm_runtime_mark_last_busy(dev->dev);
pm_runtime_put_autosuspend(dev->dev);
Expand Down

0 comments on commit 6a77bc0

Please sign in to comment.