Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d0c741 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "serial: msm_geni_serial: Avoid suspend post port close"

parents c787fa43 c46b5faf

drivers/tty/serial/msm_geni_serial.c

+8 −1
Original line number Diff line number Diff line
@@ -1710,6 +1710,7 @@ static void msm_geni_serial_shutdown(struct uart_port *uport) 
{

	struct msm_geni_serial_port *msm_port = GET_DEV_PORT(uport);

	unsigned long flags;

	int ret;



	if (!uart_console(uport)) {

		msm_geni_serial_power_on(uport);
@@ -1735,7 +1736,13 @@ static void msm_geni_serial_shutdown(struct uart_port *uport) 
			}

			msm_port->ioctl_count = 0;

		}

		msm_geni_serial_power_off(uport);



		ret = pm_runtime_put_sync_suspend(uport->dev);

		if (ret) {

			IPC_LOG_MSG(msm_port->ipc_log_pwr,

			"%s: Failed to suspend:%d\n", __func__, ret);

		}



		if (msm_port->wakeup_irq > 0) {

			irq_set_irq_wake(msm_port->wakeup_irq, 0);

			disable_irq(msm_port->wakeup_irq);