From 849f526dc265809d97e44b7387fec1b228f58423 Mon Sep 17 00:00:00 2001 From: Sujit Reddy Thumma Date: Wed, 23 Nov 2011 08:43:18 +0530 Subject: [PATCH] --- yaml --- r: 276618 b: refs/heads/master c: 49df78074963c97e25debc3c67b72f059111607d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c5eb699094ee..ab9349e1d823 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 524bfca2b42a7c9dc43af13e1592b21dd1ce3fcc +refs/heads/master: 49df78074963c97e25debc3c67b72f059111607d diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c index 271efeac860b..950b97d7412a 100644 --- a/trunk/drivers/mmc/core/core.c +++ b/trunk/drivers/mmc/core/core.c @@ -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. @@ -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; }