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

Commit 5ecca31c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm_serial_hs: Access hardware with clocks on during port close"

parents 94ff9b14 4c8d4d87

drivers/tty/serial/msm_serial_hs.c

+2 −2
Original line number Diff line number Diff line
@@ -3386,8 +3386,6 @@ static void msm_hs_shutdown(struct uart_port *uport) 
	hrtimer_cancel(&msm_uport->clk_off_timer);

	flush_work(&msm_uport->clock_off_w);



	/* Stop remote side from sending data */

	msm_hs_disable_flow_control(uport);

	if (use_low_power_wakeup(msm_uport))

		irq_set_irq_wake(msm_uport->wakeup.irq, 0);
@@ -3408,6 +3406,8 @@ static void msm_hs_shutdown(struct uart_port *uport) 
		MSM_HS_WARN("Shutdown called when tx buff not empty");



	msm_hs_clock_vote(msm_uport);

	/* Stop remote side from sending data */

	msm_hs_disable_flow_control(uport);

	/* make sure rx tasklet finishes */

	tasklet_kill(&msm_uport->rx.tlet);

	if (msm_uport->rx.flush == FLUSH_STOP)