1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 24280d9a05e9..de1c143b475f 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1712,7 +1712,8 @@ static int serial_omap_probe(struct platform_device *pdev)
         return 0;
 
 err_add_port:
-        pm_runtime_put(&pdev->dev);
+        pm_runtime_dont_use_autosuspend(&pdev->dev);
+        pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         pm_qos_remove_request(&up->pm_qos_request);
         device_init_wakeup(up->dev, false);
@@ -1725,9 +1726,13 @@ static int serial_omap_remove(struct platform_device *dev)
 {
         struct uart_omap_port *up = platform_get_drvdata(dev);
 
+        pm_runtime_get_sync(up->dev);
+
+        uart_remove_one_port(&serial_omap_reg, &up->port);
+
+        pm_runtime_dont_use_autosuspend(up->dev);
         pm_runtime_put_sync(up->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);