[PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

[PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

[Ohad Ben-Cohen]

30201e7 allowed skipping detection of nonremovable cards on
mmc_rescan(). The intention was to only skip detection of hardwired
cards that cannot be removed, so make sure this is indeed the
case by directly checking for (lack of) MMC_CAP_NONREMOVABLE, instead
of using mmc_card_is_removable(), which is overloaded with
CONFIG_MMC_UNSAFE_RESUME semantics.

Reported-and-tested-by: Dmitry Shmidt <dimitrysh@google.com>
Reported-and-tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: <stable@kernel.org>
---
Based on linux-2.6.git master, as this should probably go to Linus.

 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 6625c05..150b5f3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work)
 	 * still present
 	 */
 	if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
-	    && mmc_card_is_removable(host))
+	    && !(host->caps & MMC_CAP_NONREMOVABLE))
 		host->bus_ops->detect(host);
 
 	/*
-- 
1.7.1

Re: [PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

[Chris Ball]

Hi Ohad,

On Tue, Mar 08 2011, Ohad Ben-Cohen wrote:
> 30201e7 allowed skipping detection of nonremovable cards on
> mmc_rescan(). The intention was to only skip detection of hardwired
> cards that cannot be removed, so make sure this is indeed the
> case by directly checking for (lack of) MMC_CAP_NONREMOVABLE, instead
> of using mmc_card_is_removable(), which is overloaded with
> CONFIG_MMC_UNSAFE_RESUME semantics.
>
> Reported-and-tested-by: Dmitry Shmidt <dimitrysh@google.com>
> Reported-and-tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
> Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
> Cc: <stable@kernel.org>
> ---
> Based on linux-2.6.git master, as this should probably go to Linus.
>
>  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 6625c05..150b5f3 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work)
>  	 * still present
>  	 */
>  	if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
> -	    && mmc_card_is_removable(host))
> +	    && !(host->caps & MMC_CAP_NONREMOVABLE))
>  		host->bus_ops->detect(host);
>  
>  	/*

Thanks, I will send this to Linus for .38 final.

I have removed the stable@ tag, because the patch causing this
regression was introduced in .38-rc1 -- it has not been part of
any released kernel.  So, as long as we fix it before .38 releases
in a week, there's no need to involve stable@.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: [PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

[Ohad Ben-Cohen]

On Tue, Mar 8, 2011 at 11:56 PM, Chris Ball <cjb@laptop.org> wrote:
> I have removed the stable@ tag, because the patch causing this
> regression was introduced in .38-rc1 -- it has not been part of
> any released kernel.  So, as long as we fix it before .38 releases
> in a week, there's no need to involve stable@.

Thanks, Chris.

I misread git describe; v2.6.37-3748-g30201e7 is of course post-2.6.37 material.