aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/omap-serial.c
diff options
context:
space:
mode:
authorRuchika Kharwar <ruchika@ti.com>2012-09-06 08:45:31 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-06 12:17:02 -0400
commit856e35bf596e83a63c8a9ec749e9f2bcd24a1bdd (patch)
treebe4be0c32baa252a18374ec346971b86a5926565 /drivers/tty/serial/omap-serial.c
parent6c3a30c7fbed820f65d5e708f1e83468d8ec9921 (diff)
serial: omap: fix sequence of pm_runtime_* calls.
pm_runtime_enable() needs to be invoked before pm_runtime_use_autosuspend(), and pm_runtime_set_autosuspend_delay() functions. Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ruchika Kharwar <ruchika@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-rw-r--r--drivers/tty/serial/omap-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 99042b0fb941..f5dcb5aa0000 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1333,12 +1333,12 @@ static int serial_omap_probe(struct platform_device *pdev)
1333 INIT_WORK(&up->qos_work, serial_omap_uart_qos_work); 1333 INIT_WORK(&up->qos_work, serial_omap_uart_qos_work);
1334 1334
1335 platform_set_drvdata(pdev, up); 1335 platform_set_drvdata(pdev, up);
1336 pm_runtime_enable(&pdev->dev);
1336 pm_runtime_use_autosuspend(&pdev->dev); 1337 pm_runtime_use_autosuspend(&pdev->dev);
1337 pm_runtime_set_autosuspend_delay(&pdev->dev, 1338 pm_runtime_set_autosuspend_delay(&pdev->dev,
1338 omap_up_info->autosuspend_timeout); 1339 omap_up_info->autosuspend_timeout);
1339 1340
1340 pm_runtime_irq_safe(&pdev->dev); 1341 pm_runtime_irq_safe(&pdev->dev);
1341 pm_runtime_enable(&pdev->dev);
1342 pm_runtime_get_sync(&pdev->dev); 1342 pm_runtime_get_sync(&pdev->dev);
1343 1343
1344 omap_serial_fill_features_erratas(up); 1344 omap_serial_fill_features_erratas(up);