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 <[email protected]>
Reported-by: Tuomas Tynkkynen <[email protected]>
Cc: Jaehoon Chung <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to