aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2010-06-30 19:02:04 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-07-03 19:00:52 +0200
commitd7e709cc0b42f050cf25e43b3d68354a061444d1 (patch)
treea247d2c22005bec2fe21ba5d478441b94a32f46a
parente03a708f5162559516444ecaa3907b3f23f57ebf (diff)
glamo-mci: enable irq line sooner to fix resume
mmc_resume_host may send commands to the MMC host, so, the IRQ line have to be re-enabled before the mmc_resume_host call. Otherwise, the call may hang, preventing the device from fully waking up.
-rw-r--r--drivers/mmc/host/glamo-mci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/glamo-mci.c b/drivers/mmc/host/glamo-mci.c
index 4fb0c4a4189..923c1ce621c 100644
--- a/drivers/mmc/host/glamo-mci.c
+++ b/drivers/mmc/host/glamo-mci.c
@@ -930,10 +930,10 @@ static int glamo_mci_resume(struct device *dev)
glamo_mci_reset(host);
mdelay(10);
- ret = mmc_resume_host(host->mmc);
-
enable_irq(host->irq);
+ ret = mmc_resume_host(host->mmc);
+
mmc_host_lazy_disable(host->mmc);
return ret;