Merge "serial: msm_geni_serial: Avoid suspend post port close" (0268b65d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/tty/serial/msm_geni_serial.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1691,6 +1691,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;

		/* Stop the console before stopping the current tx */
		if (uart_console(uport)) {
		@@ -1719,7 +1720,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);