diff --git a/[refs] b/[refs] index 7af238bb8213..546baafe2e07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f1d791882d21a4002a719fb016a1ac21c8bd6b7 +refs/heads/master: 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c index 31ae07a36576..57dcf8fa774a 100644 --- a/trunk/drivers/mmc/core/core.c +++ b/trunk/drivers/mmc/core/core.c @@ -1773,6 +1773,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, case PM_POST_SUSPEND: case PM_POST_HIBERNATION: + case PM_POST_RESTORE: spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 0;