mmc: msm_sdcc: Change initialization order of busclk_timer in probe

[deliverable/linux.git] / drivers / mmc / host / msm_sdcc.c

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index c405e93335e2676a282d5dfb957b06546cb0da41..a835ac0269e077143570c276edc2aa7040a9d1b1 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1218,6 +1218,10 @@ msmsdcc_probe(struct platform_device *pdev)
        host->plat = plat;
        host->mmc = mmc;
        host->curr.cmd = NULL;
+       init_timer(&host->busclk_timer);
+       host->busclk_timer.data = (unsigned long) host;
+       host->busclk_timer.function = msmsdcc_busclk_expired;
+
 
        host->cmdpoll = 1;
 
@@ -1335,10 +1339,6 @@ msmsdcc_probe(struct platform_device *pdev)
                host->eject = !host->oldstat;
        }
 
-       init_timer(&host->busclk_timer);
-       host->busclk_timer.data = (unsigned long) host;
-       host->busclk_timer.function = msmsdcc_busclk_expired;
-
        ret = request_irq(cmd_irqres->start, msmsdcc_irq, IRQF_SHARED,
                          DRIVER_NAME " (cmd)", host);
        if (ret)