lkml.org 
[lkml]   [2011]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] [112/139] mmc: Fix re-probing with PM_POST_RESTORE notification
Date
2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Takashi Iwai <tiwai@suse.de>

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>

---
drivers/mmc/core/core.c | 1 +
1 file changed, 1 insertion(+)

Index: linux-2.6.35.y/drivers/mmc/core/core.c
===================================================================
--- linux-2.6.35.y.orig/drivers/mmc/core/core.c
+++ linux-2.6.35.y/drivers/mmc/core/core.c
@@ -1366,6 +1366,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;

\
 
 \ /
  Last update: 2011-02-02 02:15    [W:0.325 / U:24.092 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site