Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210455
b: refs/heads/master
c: e7cb756
h: refs/heads/master
i:
  210453: ff6af20
  210451: fd17077
  210447: 0509e57
v: v3
  • Loading branch information
Ethan Du authored and Linus Torvalds committed Sep 10, 2010
1 parent 275c6f5 commit 0ffaf68
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: 23ef309a6e070490da0a37b9b6383819f8170ea3
refs/heads/master: e7cb756fc3c7c32040283963572258381b342dff
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/host/omap_hsmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2323,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev)
}
}
cancel_work_sync(&host->mmc_carddetect_work);
mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc);
mmc_host_enable(host->mmc);
if (ret == 0) {
omap_hsmmc_disable_irq(host);
OMAP_HSMMC_WRITE(host->base, HCTL,
Expand Down

0 comments on commit 0ffaf68

Please sign in to comment.