From 2293e63dac9f300f5b7ba43e68944c72843e9fc1 Mon Sep 17 00:00:00 2001 From: Ruchika Kharwar Date: Thu, 6 Sep 2012 15:45:31 +0300 Subject: [PATCH] --- yaml --- r: 325732 b: refs/heads/master c: 856e35bf596e83a63c8a9ec749e9f2bcd24a1bdd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 07bc33b4258d..ae80d45a40cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c3a30c7fbed820f65d5e708f1e83468d8ec9921 +refs/heads/master: 856e35bf596e83a63c8a9ec749e9f2bcd24a1bdd diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 99042b0fb941..f5dcb5aa0000 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -1333,12 +1333,12 @@ static int serial_omap_probe(struct platform_device *pdev) INIT_WORK(&up->qos_work, serial_omap_uart_qos_work); platform_set_drvdata(pdev, up); + pm_runtime_enable(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, omap_up_info->autosuspend_timeout); pm_runtime_irq_safe(&pdev->dev); - pm_runtime_enable(&pdev->dev); pm_runtime_get_sync(&pdev->dev); omap_serial_fill_features_erratas(up);