bug in AT91 MCI suspend routines

From: Anti Sullin <[email protected]>

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.

---

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
===================================================================
@@ -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)