Commit 99ba0405 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Pierre Ossman

mmc: at91_mci: reorder timer setup and mmc_add_host() call

As said in function comment mmc_add_host() requires that:
"The host must be prepared to start servicing requests
before this function completes."

During this function, at91_mci_request() can be invoqued
without timer beeing setup leading to a kernel Oops.
This has been reported inserting this driver as a module.
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Reported-by: default avatarWu Xuan <wux@landicorp.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 8decec78
...@@ -1088,6 +1088,8 @@ static int __init at91_mci_probe(struct platform_device *pdev) ...@@ -1088,6 +1088,8 @@ static int __init at91_mci_probe(struct platform_device *pdev)
goto fail0; goto fail0;
} }
setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host);
platform_set_drvdata(pdev, mmc); platform_set_drvdata(pdev, mmc);
/* /*
...@@ -1101,8 +1103,6 @@ static int __init at91_mci_probe(struct platform_device *pdev) ...@@ -1101,8 +1103,6 @@ static int __init at91_mci_probe(struct platform_device *pdev)
mmc_add_host(mmc); mmc_add_host(mmc);
setup_timer(&host->timer, at91_timeout_timer, (unsigned long)host);
/* /*
* monitor card insertion/removal if we can * monitor card insertion/removal if we can
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment