From: Takashi Iwai Date: Fri, 10 Dec 2010 07:40:31 +0000 (+0100) Subject: mmc: Fix re-probing with PM_POST_RESTORE notification X-Git-Tag: firefly_0821_release~7613^2~3168^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=274476f8fe0b6ac9bac542cc39de12c3dd0f43f6;p=firefly-linux-kernel-4.4.55.git 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: Signed-off-by: Takashi Iwai Signed-off-by: Chris Ball --- 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;