This is a note to let you know that I've just added the patch titled
mmc: Fix re-probing with PM_POST_RESTORE notification
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-fix-re-probing-with-pm_post_restore-notification.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Fri, 10 Dec 2010 08:40:31 +0100
Subject: mmc: Fix re-probing with PM_POST_RESTORE notification
From: Takashi Iwai <[email protected]>
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 <[email protected]>
Signed-off-by: Chris Ball <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/mmc/core/core.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1720,6 +1720,7 @@ int mmc_pm_notify(struct notifier_block
case PM_POST_SUSPEND:
case PM_POST_HIBERNATION:
+ case PM_POST_RESTORE:
spin_lock_irqsave(&host->lock, flags);
host->rescan_disable = 0;
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/alsa-hda-enable-jack-sense-for-thinkpad-edge-11.patch
queue-2.6.36/alsa-hda-do-not-wrongly-restrict-min_channels-based-on-eld.patch
queue-2.6.36/alsa-hda-use-model-lg-quirk-for-lg-p1-express-to-enable-playback-and-capture.patch
queue-2.6.36/pm-hibernate-fix-pm_post_-notification-with-user-space-suspend.patch
queue-2.6.36/alsa-hda-use-position_fix-1-for-acer-aspire-5538-to-enable-capture-on-internal-mic.patch
queue-2.6.36/mmc-fix-re-probing-with-pm_post_restore-notification.patch
queue-2.6.36/alsa-hda-always-allow-basic-audio-irrespective-of-eld-info.patch
queue-2.6.36/alsa-hda-quirk-for-dell-vostro-320-to-make-microphone-work.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
