1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index f5d8b53be333..352d4797865b 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1327,7 +1327,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto clean_up2;
 
-        mmc_add_host(mmc);
+        INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
 
         sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
 
@@ -1338,22 +1338,24 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         }
         ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host);
         if (ret) {
-                free_irq(irq[0], host);
                 dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
-                goto clean_up3;
+                goto clean_up4;
         }
 
-        INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
-
-        mmc_detect_change(host->mmc, 0);
+        ret = mmc_add_host(mmc);
+        if (ret < 0)
+                goto clean_up5;
 
         dev_info(&pdev->dev, "driver version %s\n", DRIVER_VERSION);
         dev_dbg(&pdev->dev, "chip ver H'%04x\n",
                 sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0x0000ffff);
         return ret;
 
+clean_up5:
+        free_irq(irq[1], host);
+clean_up4:
+        free_irq(irq[0], host);
 clean_up3:
-        mmc_remove_host(mmc);
         pm_runtime_suspend(&pdev->dev);
 clean_up2:
         pm_runtime_disable(&pdev->dev);