From e9f01628b8a854fb25a591730b388ddd96f7a0f9 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Wed, 23 May 2012 15:52:15 +0200 Subject: [PATCH] --- yaml --- r: 311053 b: refs/heads/master c: b87cc1b5d3a96ef9f1b3a4f8ce7aaff18e96c994 h: refs/heads/master i: 311051: f6af9d523a72cf8904530b4b2f448c5dbd0a8e54 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/atmel-mci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 29b70425057c..dddbb2bc88ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09eeff52bf20d485bcafc441f01c142c59c3da16 +refs/heads/master: b87cc1b5d3a96ef9f1b3a4f8ce7aaff18e96c994 diff --git a/trunk/drivers/mmc/host/atmel-mci.c b/trunk/drivers/mmc/host/atmel-mci.c index 420aca642b14..456c077455cb 100644 --- a/trunk/drivers/mmc/host/atmel-mci.c +++ b/trunk/drivers/mmc/host/atmel-mci.c @@ -2314,6 +2314,8 @@ static int __init atmci_probe(struct platform_device *pdev) platform_set_drvdata(pdev, host); + setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host); + /* We need at least one slot to succeed */ nr_slots = 0; ret = -ENODEV; @@ -2352,8 +2354,6 @@ static int __init atmci_probe(struct platform_device *pdev) } } - setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host); - dev_info(&pdev->dev, "Atmel MCI controller at 0x%08lx irq %d, %u slots\n", host->mapbase, irq, nr_slots);