From 0ffaf68f11a0972cb2af2553f0f74c69d62a3ab6 Mon Sep 17 00:00:00 2001 From: Ethan Du Date: Thu, 9 Sep 2010 16:37:49 -0700 Subject: [PATCH] --- yaml --- r: 210455 b: refs/heads/master c: e7cb756fc3c7c32040283963572258381b342dff h: refs/heads/master i: 210453: ff6af2055c4dba65b5cb4242d103d439d5f55a64 210451: fd17077a4fcf14e81783b0766d152d73e1443046 210447: 0509e5724fe69478fb82d4d9a0cc54744356fc47 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85ba15284c4a..73112534ed9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23ef309a6e070490da0a37b9b6383819f8170ea3 +refs/heads/master: e7cb756fc3c7c32040283963572258381b342dff diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index fb6446a6fb4d..4526d2791f29 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -2323,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev) } } cancel_work_sync(&host->mmc_carddetect_work); - mmc_host_enable(host->mmc); ret = mmc_suspend_host(host->mmc); + mmc_host_enable(host->mmc); if (ret == 0) { omap_hsmmc_disable_irq(host); OMAP_HSMMC_WRITE(host->base, HCTL,