[PATCH] bug in AT91 MCI suspend routines

[Nicolas Ferre <nicolas.ferre@rfo.atmel.com>]

From: Anti Sullin <anti.sullin@artecdesign.ee>

This patch fixes a bug in AT91 mmc host driver, that enables the wakeup 
from suspend on card detection pin even if the card detect pin is not 
available (==0). If not card detection pin is defined, IRQ0 == FIQ gets 
enabled and if some activity is present on that pin, the system gets a 
FIQ request, that causes a crash.
Signed-off-by: Anti Sullin <anti.sullin@artecdesign.ee>
Signed-off-by: Nicolas Ferre <nicolas.ferre@rfo.atmel.com>
---

Original patch from Anti Sullin reviewed by Andrew Victor and
Marc Pignat ; thank you to all of you.

drivers/mmc/host/at91_mci.c |    6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-snapshot/drivers/mmc/host/at91_mci.c
===================================================================
--- linux-2.6-snapshot.orig/drivers/mmc/host/at91_mci.c
+++ linux-2.6-snapshot/drivers/mmc/host/at91_mci.c
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct

	host = mmc_priv(mmc);

-	if (host->present != -1) {
+	if (host->board->det_pin) {
		device_init_wakeup(&pdev->dev, 0);
		free_irq(host->board->det_pin, host);
		cancel_delayed_work(&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platf
	struct at91mci_host *host = mmc_priv(mmc);
	int ret = 0;

-	if (device_may_wakeup(&pdev->dev))
+	if (host->board->det_pin && device_may_wakeup(&pdev->dev))
		enable_irq_wake(host->board->det_pin);

	if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platfo
	struct at91mci_host *host = mmc_priv(mmc);
	int ret = 0;

-	if (device_may_wakeup(&pdev->dev))
+	if (host->board->det_pin && device_may_wakeup(&pdev->dev))
		disable_irq_wake(host->board->det_pin);

	if (mmc)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/