From: Shubhrajyoti Datta <shubhrajyoti.da...@xilinx.com>

While checking for console_suspend_enabled also check if the
device is a console.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.da...@xilinx.com>
Signed-off-by: Michal Simek <michal.si...@xilinx.com>
---

Changes in v2: None

 drivers/tty/serial/xilinx_uartps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c 
b/drivers/tty/serial/xilinx_uartps.c
index 0140644391df..9cdc36be5b13 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -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);
 
-- 
1.9.1

Reply via email to