Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942Ab0LKV4J (ORCPT ); Sat, 11 Dec 2010 16:56:09 -0500 Received: from void.printf.net ([89.145.121.20]:60668 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432Ab0LKV4H (ORCPT ); Sat, 11 Dec 2010 16:56:07 -0500 Date: Sat, 11 Dec 2010 21:55:57 +0000 From: Chris Ball To: Takashi Iwai Cc: "Rafael J. Wysocki" , Maxim Levitsky , Oliver Neukum , Andrew Morton , Pavel Machek , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mmc: Fix re-probing after hibernation Message-ID: <20101211215557.GA25693@void.printf.net> References: <1291821839-15088-1-git-send-email-tiwai@suse.de> <20101209015303.GB19741@void.printf.net> <201012092137.24603.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1423 Lines: 41 Hi Takashi, On Fri, Dec 10, 2010 at 08:40:31AM +0100, Takashi Iwai wrote: > Subject: [PATCH] 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: > Signed-off-by: Takashi Iwai > --- > drivers/mmc/core/core.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > index 31ae07a..57dcf8f 100644 > --- a/drivers/mmc/core/core.c > +++ b/drivers/mmc/core/core.c > @@ -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; Thanks, have pushed this to mmc-next and queued it for .37/stable. -- Chris Ball One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/