mmc: atmel-mci: fix data timeout issue

The data timeout timer was configured after mmc_add_host call. So, with bad
timings, it was possible to have a mmc request causing mod_timer call on a
non setup timer.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 420aca642b14..456c077455cb 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/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);