Merge "spmi-pmic-arb: check apid enabled before calling the handler" into msm-4.8 (f3e4fad4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/spmi/spmi-pmic-arb.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -543,8 +543,8 @@ static void pmic_arb_chained_irq(struct irq_desc *desc)
		void __iomem *intr = pa->intr;
		int first = pa->min_apid >> 5;
		int last = pa->max_apid >> 5;
		u32 status;
		int i, id;
		u32 status, enable;
		int i, id, apid;

		chained_irq_enter(chip, desc);

		@@ -554,7 +554,11 @@ static void pmic_arb_chained_irq(struct irq_desc *desc)
		while (status) {
		id = ffs(status) - 1;
		status &= ~BIT(id);
		periph_interrupt(pa, id + i * 32);
		apid = id + i * 32;
		enable = readl_relaxed(intr +
		pa->ver_ops->acc_enable(apid));
		if (enable & SPMI_PIC_ACC_ENABLE_BIT)
		periph_interrupt(pa, apid);
		}
		}