diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-10 08:40:31 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-12-21 20:46:49 +0100 |
| commit | 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 (patch) | |
| tree | 9f5a38fec3e40135523d37eb1b49a1bf19728a5a | |
| parent | mmc: atmel-mci: fix multiblock SDIO transfers (diff) | |
| download | linux-274476f8fe0b6ac9bac542cc39de12c3dd0f43f6.tar.xz linux-274476f8fe0b6ac9bac542cc39de12c3dd0f43f6.zip | |
mmc: Fix re-probing with PM_POST_RESTORE notification
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.
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -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 31ae07a36576..57dcf8fa774a 100644 --- a/drivers/mmc/core/core.c +++ b/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; |