Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332840
b: refs/heads/master
c: c4c8eeb
h: refs/heads/master
v: v3
  • Loading branch information
Vaibhav Bedia authored and Chris Ball committed Oct 3, 2012
1 parent 40bda3f commit 96ae164
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: 6bf2af8cd2cb35f6098953a33b9a160a4ca0b626
refs/heads/master: c4c8eeb4df00aabb641553d6fbcd46f458e56cd9
3 changes: 1 addition & 2 deletions trunk/drivers/mmc/host/omap_hsmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2050,8 +2050,7 @@ static int omap_hsmmc_suspend(struct device *dev)
if (ret) {
host->suspended = 0;
if (host->pdata->resume) {
ret = host->pdata->resume(dev, host->slot_id);
if (ret)
if (host->pdata->resume(dev, host->slot_id))
dev_dbg(dev, "Unmask interrupt failed\n");
}
goto err;
Expand Down

0 comments on commit 96ae164

Please sign in to comment.