[APPLIED] Re: [Maverick] pull-request: mmc: fix all hangs related to mmc/sd card insert/removal during

[Lee Jones]

Good catch.

Thanks John.

On 08/09/10 23:06, John Rigby wrote:
> This patch causes build breakage if CONFIG_PM=n.  Upstream fix below.
> 
> From c97526d61aa4457e349a6e0086c02914c88f6873 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig at pengutronix.de>
> Date: Wed, 18 Aug 2010 09:25:38 -0700
> Subject: [PATCH] mmc: build fix: mmc_pm_notify is only available with
> CONFIG_PM=y
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix
> all hangs related to mmc/sd card insert/removal during suspend/resume")
> 
> Cc: David Brownell <david-b at pacbell.net>
> Cc: Alan Stern <stern at rowland.harvard.edu>
> Cc: linux-mmc at vger.kernel.org
> Cc: Andrew Morton <akpm at linux-foundation.org>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> Acked-by: Kukjin Kim <kgene.kim at samsung.com>
> Acked-by: Maxim Levitsky <maximlevitsky at gmail.com>
> Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
> Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
> (cherry picked from commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505)
> ---
>  drivers/mmc/core/host.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index 0efe631..d80cfdc 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct
> device *dev)
>         init_waitqueue_head(&host->wq);
>         INIT_DELAYED_WORK(&host->detect, mmc_rescan);
>         INIT_DELAYED_WORK_DEFERRABLE(&host->disable,
> mmc_host_deeper_disable);
> +#ifdef CONFIG_PM
>         host->pm_notify.notifier_call = mmc_pm_notify;
> +#endif
> 
>         /*
>          * By default, hosts do not support SGIO or large requests.