diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-10 08:40:31 +0100 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:03:48 -0800 |
| commit | 01dda54376c56e99e475193d6c112f05476e5280 (patch) | |
| tree | b0b633648ec31059d000e1c6302e8494c4d60409 | |
| parent | 3fa84c1cbf8baca625f08f475338193ee9be1eea (diff) | |
| download | lwn-01dda54376c56e99e475193d6c112f05476e5280.tar.gz lwn-01dda54376c56e99e475193d6c112f05476e5280.zip | |
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -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 365997e28f32..c9a876602b32 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1366,6 +1366,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; |