diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:07:36 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:07:36 +1100 |
commit | 8ef7b197cb80c3f0a98425ca3f6fb5bf6577642f (patch) | |
tree | df730a0df70a31ebdf1428eb1acc01c6e4c52705 /drivers/mmc/host/at91_mci.c | |
parent | c137d45e5e1f1d709da3724fcb1b26dae2a96343 (diff) | |
parent | 12f16cb1d29bf16ab625929f3601725f96546691 (diff) |
Merge commit 'mmc/next'
Diffstat (limited to 'drivers/mmc/host/at91_mci.c')
-rw-r--r-- | drivers/mmc/host/at91_mci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 1f8b5b36222c..e556d42cc45a 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -1088,6 +1088,8 @@ static int __init at91_mci_probe(struct platform_device *pdev) goto fail0; } + setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host); + platform_set_drvdata(pdev, mmc); /* @@ -1101,8 +1103,6 @@ static int __init at91_mci_probe(struct platform_device *pdev) mmc_add_host(mmc); - setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host); - /* * monitor card insertion/removal if we can */ |