diff options
| author | Andrew Victor <andrew@sanpeople.com> | 2007-01-09 13:20:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-01-24 11:59:55 +0000 |
| commit | 9b938166907558e664d8fa413e6233a36669e0c0 (patch) | |
| tree | e19a582c7d77311b2faaafaeb50125bd398aee62 /drivers/serial | |
| parent | e9d10a16ea76f42ea9ce58508e4af7c52acf1e40 (diff) | |
| download | linux-stable-9b938166907558e664d8fa413e6233a36669e0c0.tar.gz linux-stable-9b938166907558e664d8fa413e6233a36669e0c0.tar.bz2 linux-stable-9b938166907558e664d8fa413e6233a36669e0c0.zip | |
[ARM] 4088/1: AT91: Unbalanced IRQ in serial driver suspend/resume
This patch fixes the unbalanced calls to enable_irq_wake() and
disable_irq_wake() in the AT91 (and AVR32) serial driver.
It should resolve these kernel messages:
Unbalanced IRQ x wake disable
BUG: warning at kernel/irq/manage.c:167/set_irq_wake()
Original patch from Marc Pignat.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/atmel_serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 1f9222c2e656..881f886b91c6 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -890,7 +890,6 @@ static int atmel_serial_suspend(struct platform_device *pdev, pm_message_t state if (device_may_wakeup(&pdev->dev) && !at91_suspend_entering_slow_clock()) enable_irq_wake(port->irq); else { - disable_irq_wake(port->irq); uart_suspend_port(&atmel_uart, port); atmel_port->suspended = 1; } @@ -907,6 +906,8 @@ static int atmel_serial_resume(struct platform_device *pdev) uart_resume_port(&atmel_uart, port); atmel_port->suspended = 0; } + else + disable_irq_wake(port->irq); return 0; } |