[PATCH] mmc: core: Fixup Oops for SDIO shutdown

[PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Ulf Hansson]

Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
Oops in the shutdown sequence for SDIO.

The drv pointer, does not exist for SDIO since the probing of the SDIO
card from the mmc_bus perspective is expected to fail by returning
-ENODEV.

This patch adds the proper check for the pointer before calling it.

Reported-by: Stephen Warren <swarren@wwwdotorg.org>
Reported-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/mmc/core/bus.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 4c0decf..d4b99bb 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -129,7 +129,8 @@ static void mmc_bus_shutdown(struct device *dev)
 	struct mmc_host *host = card->host;
 	int ret;
 
-	drv->shutdown(card);
+	if (dev->driver && drv->shutdown)
+		drv->shutdown(card);
 
 	if (host->bus_ops->shutdown) {
 		ret = host->bus_ops->shutdown(host);
-- 
1.7.10

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Jaehoon Chung]

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

On 07/02/2013 07:53 PM, Ulf Hansson wrote:
> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
> Oops in the shutdown sequence for SDIO.
> 
> The drv pointer, does not exist for SDIO since the probing of the SDIO
> card from the mmc_bus perspective is expected to fail by returning
> -ENODEV.
> 
> This patch adds the proper check for the pointer before calling it.
> 
> Reported-by: Stephen Warren <swarren@wwwdotorg.org>
> Reported-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
>  drivers/mmc/core/bus.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 4c0decf..d4b99bb 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -129,7 +129,8 @@ static void mmc_bus_shutdown(struct device *dev)
>  	struct mmc_host *host = card->host;
>  	int ret;
>  
> -	drv->shutdown(card);
> +	if (dev->driver && drv->shutdown)
> +		drv->shutdown(card);
>  
>  	if (host->bus_ops->shutdown) {
>  		ret = host->bus_ops->shutdown(host);
> 

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Tuomas Tynkkynen]

On 07/02/2013 01:53 PM, Ulf Hansson wrote:
> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
> Oops in the shutdown sequence for SDIO.
> 
> The drv pointer, does not exist for SDIO since the probing of the SDIO
> card from the mmc_bus perspective is expected to fail by returning
> -ENODEV.
> 
> This patch adds the proper check for the pointer before calling it.
> 
> Reported-by: Stephen Warren <swarren@wwwdotorg.org>
> Reported-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---

Hi,

That fixes it, thanks.

Tested-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Stephen Warren]

On 07/02/2013 04:53 AM, Ulf Hansson wrote:
> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
> Oops in the shutdown sequence for SDIO.
> 
> The drv pointer, does not exist for SDIO since the probing of the SDIO
> card from the mmc_bus perspective is expected to fail by returning
> -ENODEV.
> 
> This patch adds the proper check for the pointer before calling it.

Tested-by: Stephen Warren <swarren@nvidia.com>

Thanks!

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Olof Johansson]

On Tue, Jul 2, 2013 at 8:15 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 07/02/2013 04:53 AM, Ulf Hansson wrote:
>> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
>> Oops in the shutdown sequence for SDIO.
>>
>> The drv pointer, does not exist for SDIO since the probing of the SDIO
>> card from the mmc_bus perspective is expected to fail by returning
>> -ENODEV.
>>
>> This patch adds the proper check for the pointer before calling it.
>
> Tested-by: Stephen Warren <swarren@nvidia.com>

Acked-by: Olof Johansson <olof@lixom.net>

Chris, I hit this on the 0705 linux-next. Can you pick up this patch
soonish please? Thanks!


-Olof

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Chris Ball]

Hi,

On Sun, Jul 07 2013, Olof Johansson wrote:
> On Tue, Jul 2, 2013 at 8:15 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 07/02/2013 04:53 AM, Ulf Hansson wrote:
>>> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
>>> Oops in the shutdown sequence for SDIO.
>>>
>>> The drv pointer, does not exist for SDIO since the probing of the SDIO
>>> card from the mmc_bus perspective is expected to fail by returning
>>> -ENODEV.
>>>
>>> This patch adds the proper check for the pointer before calling it.
>>
>> Tested-by: Stephen Warren <swarren@nvidia.com>
>
> Acked-by: Olof Johansson <olof@lixom.net>
>
> Chris, I hit this on the 0705 linux-next. Can you pick up this patch
> soonish please? Thanks!

Sorry for the delay -- I merged this on Friday, so it'll be in
tonight's -next.

Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>

Re: [PATCH] mmc: core: Fixup Oops for SDIO shutdown

[Olof Johansson]

On Sun, Jul 7, 2013 at 10:25 AM, Chris Ball <cjb@laptop.org> wrote:
> Hi,
>
> On Sun, Jul 07 2013, Olof Johansson wrote:
>> On Tue, Jul 2, 2013 at 8:15 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>> On 07/02/2013 04:53 AM, Ulf Hansson wrote:
>>>> Commit "mmc: core: Handle card shutdown from mmc_bus" introduced an
>>>> Oops in the shutdown sequence for SDIO.
>>>>
>>>> The drv pointer, does not exist for SDIO since the probing of the SDIO
>>>> card from the mmc_bus perspective is expected to fail by returning
>>>> -ENODEV.
>>>>
>>>> This patch adds the proper check for the pointer before calling it.
>>>
>>> Tested-by: Stephen Warren <swarren@nvidia.com>
>>
>> Acked-by: Olof Johansson <olof@lixom.net>
>>
>> Chris, I hit this on the 0705 linux-next. Can you pick up this patch
>> soonish please? Thanks!
>
> Sorry for the delay -- I merged this on Friday, so it'll be in
> tonight's -next.

Great, thanks!


-Olof