diff options
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 9 | 
1 files changed, 3 insertions, 6 deletions
| diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 8a696a4efbe..c19d340f6ba 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/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;  } | 
