Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276618
b: refs/heads/master
c: 49df780
h: refs/heads/master
v: v3
  • Loading branch information
Sujit Reddy Thumma authored and Chris Ball committed Dec 10, 2011
1 parent c0873fb commit 849f526
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 524bfca2b42a7c9dc43af13e1592b21dd1ce3fcc
refs/heads/master: 49df78074963c97e25debc3c67b72f059111607d
3 changes: 2 additions & 1 deletion trunk/drivers/mmc/core/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2333,6 +2333,8 @@ int mmc_suspend_host(struct mmc_host *host)
mmc_poweroff_notify(host);
err = host->bus_ops->suspend(host);
}
mmc_do_release_host(host);

if (err == -ENOSYS || !host->bus_ops->resume) {
/*
* We simply "remove" the card in this case.
Expand All @@ -2347,7 +2349,6 @@ int mmc_suspend_host(struct mmc_host *host)
host->pm_flags = 0;
err = 0;
}
mmc_do_release_host(host);
} else {
err = -EBUSY;
}
Expand Down

0 comments on commit 849f526

Please sign in to comment.