serial: uartps: Check if the device is a console
authorShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Tue, 18 Dec 2018 12:18:40 +0000 (13:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Dec 2018 07:23:20 +0000 (08:23 +0100)
While checking for console_suspend_enabled also check if the
device is a console.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/xilinx_uartps.c

index 0140644..9cdc36b 100644 (file)
@@ -1255,7 +1255,7 @@ static int cdns_uart_suspend(struct device *device)
 
        may_wake = device_may_wakeup(device);
 
-       if (console_suspend_enabled && may_wake) {
+       if (console_suspend_enabled && uart_console(port) && may_wake) {
                unsigned long flags = 0;
 
                spin_lock_irqsave(&port->lock, flags);
@@ -1293,7 +1293,7 @@ static int cdns_uart_resume(struct device *device)
 
        may_wake = device_may_wakeup(device);
 
-       if (console_suspend_enabled && !may_wake) {
+       if (console_suspend_enabled && uart_console(port) && !may_wake) {
                clk_enable(cdns_uart->pclk);
                clk_enable(cdns_uart->uartclk);