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

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

Merge "pinctrl: msm: prevent bogus wake up from suspend"

parents 7dccb9da b036deef

drivers/pinctrl/pinctrl-msm-tlmm-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int msm_tlmm_v3_gp_irq_suspend(void) 
	for_each_set_bit(i, ic->enabled_irqs, num_irqs)

		msm_tlmm_v3_set_intr_cfg_enable(ic, i, 0);



	for_each_set_bit(i, ic->enabled_irqs, num_irqs)

	for_each_set_bit(i, ic->wake_irqs, num_irqs)

		msm_tlmm_v3_set_intr_cfg_enable(ic, i, 1);

	mb();

	spin_unlock_irqrestore(&ic->irq_lock, irq_flags);

drivers/pinctrl/pinctrl-msm-tlmm-v4.c

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int msm_tlmm_v4_gp_irq_suspend(void) 
	for_each_set_bit(i, ic->enabled_irqs, num_irqs)

		msm_tlmm_v4_set_intr_cfg_enable(ic, i, 0);



	for_each_set_bit(i, ic->enabled_irqs, num_irqs)

	for_each_set_bit(i, ic->wake_irqs, num_irqs)

		msm_tlmm_v4_set_intr_cfg_enable(ic, i, 1);

	mb();

	spin_unlock_irqrestore(&ic->irq_lock, irq_flags);