Re: [PATCH] mmc: Fix re-probing after hibernation

[Chris Ball <cjb@laptop.org>]

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: <stable@kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  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   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child