diff options
author | Sahitya Tummala <stummala@codeaurora.org> | 2011-05-02 08:40:01 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-10-26 15:43:37 -0400 |
commit | 19207f056d6dd390f96749e643a222d48517f7b1 (patch) | |
tree | 9684d8a25052573722cc184529cfc880ad70af63 | |
parent | 4a268e0879c4044523757b6ac94b56fc7955a116 (diff) |
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>
-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) | |||
1218 | host->plat = plat; | 1218 | host->plat = plat; |
1219 | host->mmc = mmc; | 1219 | host->mmc = mmc; |
1220 | host->curr.cmd = NULL; | 1220 | host->curr.cmd = NULL; |
1221 | init_timer(&host->busclk_timer); | ||
1222 | host->busclk_timer.data = (unsigned long) host; | ||
1223 | host->busclk_timer.function = msmsdcc_busclk_expired; | ||
1224 | |||
1221 | 1225 | ||
1222 | host->cmdpoll = 1; | 1226 | host->cmdpoll = 1; |
1223 | 1227 | ||
@@ -1335,10 +1339,6 @@ msmsdcc_probe(struct platform_device *pdev) | |||
1335 | host->eject = !host->oldstat; | 1339 | host->eject = !host->oldstat; |
1336 | } | 1340 | } |
1337 | 1341 | ||
1338 | init_timer(&host->busclk_timer); | ||
1339 | host->busclk_timer.data = (unsigned long) host; | ||
1340 | host->busclk_timer.function = msmsdcc_busclk_expired; | ||
1341 | |||
1342 | ret = request_irq(cmd_irqres->start, msmsdcc_irq, IRQF_SHARED, | 1342 | ret = request_irq(cmd_irqres->start, msmsdcc_irq, IRQF_SHARED, |
1343 | DRIVER_NAME " (cmd)", host); | 1343 | DRIVER_NAME " (cmd)", host); |
1344 | if (ret) | 1344 | if (ret) |