From bfb307d233939f044cb77ad391d301fa666c6c96 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 6 Sep 2012 15:45:29 +0300 Subject: [PATCH] --- yaml --- r: 325730 b: refs/heads/master c: 7e9c8e7dbf3b9cc94947d76cb57985682517cc6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2487bc4f15d2..69fa48bbb043 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b42c8b29b1822436e690fd0a7906aaa62099f91 +refs/heads/master: 7e9c8e7dbf3b9cc94947d76cb57985682517cc6e diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index c19d340f6ba8..0ceca4457d3b 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -1369,6 +1369,7 @@ static int serial_omap_remove(struct platform_device *dev) { struct uart_omap_port *up = platform_get_drvdata(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);