diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
| commit | 5d7e606a3696b992df40afaf9b04872320346c41 (patch) | |
| tree | 92b060685f1187ae895eb8dc7256445ed455bfa5 /drivers/mmc/core/host.c | |
| parent | 546c9b21117077f145d59a0168fcb6fd0a3c3b24 (diff) | |
| parent | 285f0b3fe3a59c56db9ae68e6a1ae0e2a67b72f9 (diff) | |
Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/mmc/core/host.c')
| -rw-r--r-- | drivers/mmc/core/host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index c3704e293a7..fe6e81529cb 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -331,6 +331,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) init_waitqueue_head(&host->wq); INIT_DELAYED_WORK(&host->detect, mmc_rescan); INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable); + INIT_DELAYED_WORK(&host->resume, mmc_resume_work); #ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; #endif |