[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1291821839-15088-1-git-send-email-tiwai@suse.de>
Date: Wed, 8 Dec 2010 16:23:59 +0100
From: Takashi Iwai <tiwai@...e.de>
To: Chris Ball <cjb@...top.org>
Cc: Maxim Levitsky <maximlevitsky@...il.com>,
Oliver Neukum <oneukum@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>,
linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] mmc: Fix re-probing after hibernation
The commit 4c2ef25fe0b847d2ae818f74758ddb0be1c27d8e
mmc: fix all hangs related to mmc/sd card insert/removal during
suspend/resume
introduced a bug where the device probing no longer works after
hibernation. This was because the pm notifier expects
PM_POST_HIBERNATION call while the system sends PM_POST_RESTORE
instead, thus disable_rescan is kept as 1.
Cc: <stable@...nel.org>
Signed-off-by: Takashi Iwai <tiwai@...e.de>
---
drivers/mmc/core/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 31ae07a..30094f6 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1772,7 +1772,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
break;
case PM_POST_SUSPEND:
- case PM_POST_HIBERNATION:
+ case PM_POST_RESTORE:
spin_lock_irqsave(&host->lock, flags);
host->rescan_disable = 0;
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists