diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-10 08:40:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-07 13:58:41 -0800 |
| commit | 3c1d55408817cce6fb21d95b1cad3ba0af041c9f (patch) | |
| tree | 82f3f3932e43e3050a2f200804401ab43700afcb | |
| parent | 3582ab36ca47895d5fa41d341969bf0d3d12a879 (diff) | |
mmc: Fix re-probing with PM_POST_RESTORE notification
commit 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 upstream.
In the error-path where PM notifies PM_POST_RESTORE, the rescan-blockage
should be cleared as well. Otherwise it'll be never re-probed.
Also, as a bonus, this fixes a bug in S4 with user-mode suspend in the
current code, as it sends PM_POST_RESTORE instead of
PM_POST_HIBERNATION wrongly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/mmc/core/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 9ca553b79f12..994454295184 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1720,6 +1720,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; |