1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 2835e29298ed..76418c139ffa 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1986,7 +1986,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (device_may_wakeup(tty_dev)) {
-                enable_irq_wake(uport->irq);
+                if (!enable_irq_wake(uport->irq))
+                        uport->irq_wake = 1;
                 put_device(tty_dev);
                 mutex_unlock(&port->mutex);
                 return 0;
@@ -2052,7 +2053,10 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
         if (!uport->suspended && device_may_wakeup(tty_dev)) {
-                disable_irq_wake(uport->irq);
+                if (uport->irq_wake) {
+                        disable_irq_wake(uport->irq);
+                        uport->irq_wake = 0;
+                }
                 mutex_unlock(&port->mutex);
                 return 0;
         }