From 4edc30440021d30b4bc351082b4d8f783a74bc21 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Mon, 2 May 2011 18:10:01 +0530 Subject: [PATCH] --- yaml --- r: 270255 b: refs/heads/master c: 19207f056d6dd390f96749e643a222d48517f7b1 h: refs/heads/master i: 270253: 0262ed86229989282bfd9cb19f287afd7d2f1c29 270251: b8f7f0a0daf746bdb489b4ac10a8c2440c280d5d 270247: 283db234933ead4706b1b9000f55ca635f2e15b7 270239: 50c8e6e5c80d96cef3f4b4862824710ef4169a9c v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/msm_sdcc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c0370e25958e..dca77899136b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a268e0879c4044523757b6ac94b56fc7955a116 +refs/heads/master: 19207f056d6dd390f96749e643a222d48517f7b1 diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c index c405e93335e2..a835ac0269e0 100644 --- a/trunk/drivers/mmc/host/msm_sdcc.c +++ b/trunk/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)