Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270255
b: refs/heads/master
c: 19207f0
h: refs/heads/master
i:
  270253: 0262ed8
  270251: b8f7f0a
  270247: 283db23
  270239: 50c8e6e
v: v3
  • Loading branch information
Sahitya Tummala authored and Chris Ball committed Oct 26, 2011
1 parent 3751fcb commit 4edc304
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a268e0879c4044523757b6ac94b56fc7955a116
refs/heads/master: 19207f056d6dd390f96749e643a222d48517f7b1
8 changes: 4 additions & 4 deletions trunk/drivers/mmc/host/msm_sdcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4edc304

Please sign in to comment.