mmc: core: merge resolution

Miscellaneous merge resolutions in mmc.

Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
This commit is contained in:
Steve Muckle
2012-06-06 18:50:59 -07:00
parent 76058d7388
commit 0de33d06dd
+6 -2
View File
@@ -2502,10 +2502,14 @@ int mmc_suspend_host(struct mmc_host *host)
err = -EBUSY;
if (!err) {
if (host->bus_ops->suspend)
if (host->bus_ops->suspend) {
if (mmc_card_doing_bkops(host->card))
mmc_interrupt_bkops(host->card);
err = host->bus_ops->suspend(host);
}
if (!(host->card && mmc_card_sdio(host->card)))
mmc_do_release_host(host);
mmc_release_host(host);
if (err == -ENOSYS || !host->bus_ops->resume) {
/*