summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2009-07-29 10:22:03 -0700
committerColin Cross <ccross@android.com>2012-02-14 11:26:17 -0800
commit52d8a4d97afcdf1197d885f1b2690ce6b10748eb (patch)
treeca6ce4f10390b2d274c9bd4b388c8a1b5f7c869b /drivers
parentb81bc9436fa79740d69fb2e0f34fe48fc33ff75e (diff)
mmc: sdio: Claim host in sdio_reset_comm()
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/sdio.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index afa93290ee4..b400056ea34 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -10,6 +10,7 @@
*/
#include <linux/err.h>
+#include <linux/module.h>
#include <linux/pm_runtime.h>
#include <linux/mmc/host.h>
@@ -1219,6 +1220,8 @@ int sdio_reset_comm(struct mmc_card *card)
int err;
printk("%s():\n", __func__);
+ mmc_claim_host(host);
+
mmc_go_idle(host);
mmc_set_clock(host, host->f_min);
@@ -1259,13 +1262,12 @@ int sdio_reset_comm(struct mmc_card *card)
err = sdio_enable_wide(card);
if (err)
goto err;
-
+ mmc_release_host(host);
return 0;
- err:
+err:
printk("%s: Error resetting SDIO communications (%d)\n",
mmc_hostname(host), err);
+ mmc_release_host(host);
return err;
}
EXPORT_SYMBOL(sdio_reset_comm);
-
-