summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-06-07 20:10:48 -0700
committerGary King <gking@nvidia.com>2010-06-07 21:26:18 -0700
commitb273513ac190827eec214542dba64c42c5fa35c6 (patch)
tree9930d53c4740374c4c5852b50e636a3e9fd65071 /drivers
parent4f75652585f8cdec87ef6b959747b3b0a4603ba2 (diff)
mmc: core: do not acquire wakelock during rescan polling
if rescan is scheduled on the work queue because the host requires periodic polling to detect card insertions, do not acquire the wakelock; otherwise, the system will never enter suspend. Change-Id: I11b2711112a771a69f25b99c0234f22ceff4d9d6 Reviewed-on: http://git-master/r/2248 Reviewed-by: Trivikram Kasivajhula <tkasivajhula@nvidia.com> Tested-by: Trivikram Kasivajhula <tkasivajhula@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index fb25fd001f4a..136c86c0acdb 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1152,7 +1152,7 @@ out:
wake_unlock(&mmc_delayed_work_wake_lock);
if (host->caps & MMC_CAP_NEEDS_POLL)
- mmc_schedule_delayed_work(&host->detect, HZ);
+ queue_delayed_work(workqueue, &host->detect, HZ);
}
void mmc_start_host(struct mmc_host *host)