From 0dc8f7e87d310274c9c68608f3a4b1b546aec01c Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 6 Sep 2012 15:45:28 +0300 Subject: [PATCH] --- yaml --- r: 325729 b: refs/heads/master c: 1b42c8b29b1822436e690fd0a7906aaa62099f91 h: refs/heads/master i: 325727: 4e0212d157072cd722ff7762ee0b794b05fb3868 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f58f73e1879f..2487bc4f15d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93220dcc3052182e7156c09655ad1316055564b9 +refs/heads/master: 1b42c8b29b1822436e690fd0a7906aaa62099f91 diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 8a696a4efbee..c19d340f6ba8 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -1369,13 +1369,10 @@ static int serial_omap_remove(struct platform_device *dev) { struct uart_omap_port *up = platform_get_drvdata(dev); - if (up) { - pm_runtime_disable(up->dev); - uart_remove_one_port(&serial_omap_reg, &up->port); - pm_qos_remove_request(&up->pm_qos_request); - } + pm_runtime_disable(up->dev); + uart_remove_one_port(&serial_omap_reg, &up->port); + pm_qos_remove_request(&up->pm_qos_request); - platform_set_drvdata(dev, NULL); return 0; }