diff options
| author |   Sahitya Tummala <stummala@codeaurora.org> | 2011-05-02 18:10:01 +0530 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2011-10-26 15:43:37 -0400 |
| commit | 19207f056d6dd390f96749e643a222d48517f7b1 (patch) | |
| tree | 9684d8a25052573722cc184529cfc880ad70af63 /drivers/mmc/host | |
| parent | mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts (diff) | |
| download | linux-dev-19207f056d6dd390f96749e643a222d48517f7b1.tar.xz linux-dev-19207f056d6dd390f96749e643a222d48517f7b1.zip | |
mmc: msm_sdcc: Change initialization order of busclk_timer in probe
Intialize busclk_timer before it is accessed in probe.
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index c405e93335e2..a835ac0269e0 100644 --- 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) |