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

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

Merge "serial: msm_serial_hs: Modify wakeup handler disablement and processing"

parents 437e1695 c0eb3fdc

drivers/tty/serial/msm_serial_hs.c

+2 −3
Original line number Diff line number Diff line
@@ -2255,7 +2255,7 @@ void disable_wakeup_interrupt(struct msm_hs_port *msm_uport) 
		return;



	if (msm_uport->wakeup.enabled) {

		disable_irq_nosync(msm_uport->wakeup.irq);

		disable_irq(msm_uport->wakeup.irq);

		enable_irq(uport->irq);

		spin_lock_irqsave(&uport->lock, flags);

		msm_uport->wakeup.enabled = false;
@@ -2614,8 +2614,7 @@ static int msm_hs_startup(struct uart_port *uport) 
	msm_hs_resource_vote(msm_uport);



	if (is_use_low_power_wakeup(msm_uport)) {

		ret = request_threaded_irq(msm_uport->wakeup.irq, NULL,

					msm_hs_wakeup_isr,

		ret = request_irq(msm_uport->wakeup.irq, msm_hs_wakeup_isr,

					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

					"msm_hs_wakeup", msm_uport);

		if (unlikely(ret)) {