diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:26 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:26 +0800 |
| commit | ce8fdbf6b69bcd0c80e9a4558c631c6fdbeedabc (patch) | |
| tree | 1dd31102da7f3c884d54d3ea059f40deff513215 /drivers/mmc/core/host.c | |
| parent | 7938fb7c7b5d887cb17915b2fa2923736d9b2467 (diff) | |
| parent | 2a8fe9f1219bffa4c076d33a19a982908480024f (diff) | |
Merge topic branch 'storage-mmc' into integration-linux-ux500
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 91c84c7a182..d87d1152ea2 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -330,6 +330,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) spin_lock_init(&host->lock); init_waitqueue_head(&host->wq); INIT_DELAYED_WORK(&host->detect, mmc_rescan); + INIT_DELAYED_WORK(&host->resume, mmc_resume_work); #ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; #endif |