1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 156b5aaed95b..b6d172873076 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -198,7 +198,7 @@ static int serial_omap_get_context_loss_count(struct uart_omap_port *up)
         struct omap_uart_port_info *pdata = up->dev->platform_data;
 
         if (!pdata || !pdata->get_context_loss_count)
-                return 0;
+                return -EINVAL;
 
         return pdata->get_context_loss_count(up->dev);
 }
@@ -1502,6 +1502,9 @@ static int serial_omap_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, up);
         pm_runtime_enable(&pdev->dev);
+        if (omap_up_info->autosuspend_timeout == 0)
+                omap_up_info->autosuspend_timeout = -1;
+        device_init_wakeup(up->dev, true);
         pm_runtime_use_autosuspend(&pdev->dev);
         pm_runtime_set_autosuspend_delay(&pdev->dev,
                         omap_up_info->autosuspend_timeout);
@@ -1611,7 +1614,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
 static int serial_omap_runtime_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
-        struct omap_uart_port_info *pdata = dev->platform_data;
 
         if (!up)
                 return -EINVAL;
@@ -1626,9 +1628,6 @@ static int serial_omap_runtime_suspend(struct device *dev)
             uart_console(&up->port))
                 return -EBUSY;
 
-        if (!pdata)
-                return 0;
-
         up->context_loss_cnt = serial_omap_get_context_loss_count(up);
 
         if (device_may_wakeup(dev)) {
@@ -1656,7 +1655,7 @@ static int serial_omap_runtime_resume(struct device *dev)
         int loss_cnt = serial_omap_get_context_loss_count(up);
 
         if (loss_cnt < 0) {
-                dev_err(dev, "serial_omap_get_context_loss_count failed : %d\n",
+                dev_dbg(dev, "serial_omap_get_context_loss_count failed : %d\n",
                         loss_cnt);
                 serial_omap_restore_context(up);
         } else if (up->context_loss_cnt != loss_cnt) {