1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index dd8b1a5458ff..08b6b9419f0d 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -225,14 +225,19 @@ static inline void serial_omap_enable_wakeirq(struct uart_omap_port *up,
         if (enable)
                 enable_irq(up->wakeirq);
         else
-                disable_irq(up->wakeirq);
+                disable_irq_nosync(up->wakeirq);
 }
 
 static void serial_omap_enable_wakeup(struct uart_omap_port *up, bool enable)
 {
         struct omap_uart_port_info *pdata = dev_get_platdata(up->dev);
 
+        if (enable == up->wakeups_enabled)
+                return;
+
         serial_omap_enable_wakeirq(up, enable);
+        up->wakeups_enabled = enable;
+
         if (!pdata || !pdata->enable_wakeup)
                 return;
 
@@ -1495,6 +1500,11 @@ static int serial_omap_suspend(struct device *dev)
         uart_suspend_port(&serial_omap_reg, &up->port);
         flush_work(&up->qos_work);
 
+        if (device_may_wakeup(dev))
+                serial_omap_enable_wakeup(up, true);
+        else
+                serial_omap_enable_wakeup(up, false);
+
         return 0;
 }
 
@@ -1502,6 +1512,9 @@ static int serial_omap_resume(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
 
+        if (device_may_wakeup(dev))
+                serial_omap_enable_wakeup(up, false);
+
         uart_resume_port(&serial_omap_reg, &up->port);
 
         return 0;
@@ -1789,6 +1802,7 @@ static int serial_omap_remove(struct platform_device *dev)
         pm_runtime_disable(up->dev);
         uart_remove_one_port(&serial_omap_reg, &up->port);
         pm_qos_remove_request(&up->pm_qos_request);
+        device_init_wakeup(&dev->dev, false);
 
         return 0;
 }
@@ -1877,17 +1891,7 @@ static int serial_omap_runtime_suspend(struct device *dev)
 
         up->context_loss_cnt = serial_omap_get_context_loss_count(up);
 
-        if (device_may_wakeup(dev)) {
-                if (!up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, true);
-                        up->wakeups_enabled = true;
-                }
-        } else {
-                if (up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, false);
-                        up->wakeups_enabled = false;
-                }
-        }
+        serial_omap_enable_wakeup(up, true);
 
         up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
         schedule_work(&up->qos_work);
@@ -1901,6 +1905,8 @@ static int serial_omap_runtime_resume(struct device *dev)
 
         int loss_cnt = serial_omap_get_context_loss_count(up);
 
+        serial_omap_enable_wakeup(up, false);
+
         if (loss_cnt < 0) {
                 dev_dbg(dev, "serial_omap_get_context_loss_count failed : %d\n",
                         loss_cnt);