from Marc Pignat <[email protected]>
fix enable_irq_wake and disable_irq_wake symmetry in at91 pcmcia driver
Signed-off-by: Marc Pignat <[email protected]>
---
This patch applies to the 2.6.21.1 kernel.
disable_irq_wake call must be symmetric with enable_irq_wake. This patch fix
that problem for the at91_pcmia driver.
It seems that this patch was forgotten when we've fixed irq_wake symmetry in
all at91 related drivers.
It was discussed in the "at91 drivers and [enable/disable]_irq_wake (wrong?)
usage" thread on the linux-arm-kernel mailing list.
Regards
Marc
--- 2.6.21.1/drivers/pcmcia/at91_cf.c.orig 2007-05-10 08:43:16.000000000 +0200
+++ 2.6.21.1/drivers/pcmcia/at91_cf.c 2007-05-10 09:07:06.000000000 +0200
@@ -336,16 +336,18 @@ static int at91_cf_suspend(struct platfo
enable_irq_wake(board->det_pin);
if (board->irq_pin)
enable_irq_wake(board->irq_pin);
- } else {
- disable_irq_wake(board->det_pin);
- if (board->irq_pin)
- disable_irq_wake(board->irq_pin);
}
return 0;
}
static int at91_cf_resume(struct platform_device *pdev)
{
+ if (device_may_wakeup(&pdev->dev)) {
+ disable_irq_wake(board->det_pin);
+ if (board->irq_pin)
+ disable_irq_wake(board->irq_pin);
+ }
+
pcmcia_socket_dev_resume(&pdev->dev);
return 0;
}