1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 2ca0afaab792..f746df493892 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -88,14 +88,19 @@ static int tmio_mmc_probe(struct platform_device *pdev)
         if (!res)
                 return -EINVAL;
 
-        /* SD control register space size is 0x200, 0x400 for bus_shift=1 */
-        pdata->bus_shift = resource_size(res) >> 10;
         pdata->flags |= TMIO_MMC_HAVE_HIGH_REG;
 
-        ret = tmio_mmc_host_probe(&host, pdev, pdata);
-        if (ret)
+        host = tmio_mmc_host_alloc(pdev);
+        if (!host)
                 goto cell_disable;
 
+        /* SD control register space size is 0x200, 0x400 for bus_shift=1 */
+        host->bus_shift = resource_size(res) >> 10;
+
+        ret = tmio_mmc_host_probe(host, pdata);
+        if (ret)
+                goto host_free;
+
         ret = request_irq(irq, tmio_mmc_irq, IRQF_TRIGGER_FALLING,
                                 dev_name(&pdev->dev), host);
         if (ret)
@@ -108,6 +113,8 @@ static int tmio_mmc_probe(struct platform_device *pdev)
 
 host_remove:
         tmio_mmc_host_remove(host);
+host_free:
+        tmio_mmc_host_free(host);
 cell_disable:
         if (cell->disable)
                 cell->disable(pdev);