Skip to content

Commit

Permalink
mmc: Fix re-probing with PM_POST_RESTORE notification
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai authored and Chris Ball committed Dec 21, 2010
1 parent 2f1d791 commit 274476f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/mmc/core/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 274476f

Please sign in to comment.