Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 274476f8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Chris Ball
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 2f1d7918

drivers/mmc/core/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1773,6 +1773,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, 




	case PM_POST_SUSPEND:

	case PM_POST_SUSPEND:

	case PM_POST_HIBERNATION:

	case PM_POST_HIBERNATION:

	case PM_POST_RESTORE:





		spin_lock_irqsave(&host->lock, flags);

		spin_lock_irqsave(&host->lock, flags);

		host->rescan_disable = 0;

		host->rescan_disable = 0;