commit 73bf8bcd8f29eb282300d94dd164e13fa5f21b88
author Greg Kroah-Hartman <gregkh@google.com> Thu May 18 14:31:21 2017 +0200
committer Pat Tjin <pattjin@google.com> Thu May 18 17:07:10 2017 +0000
tree ba875c8da5b0c2104a35fa6b2ebc1e3ad6638c3c
parent 2a5cacb37143c169d3993c9b6d297524bab32cc8

Revert "pinctrl: qcom: Don't clear status bit on irq_unmask"

This reverts commit 08b1ade02e584ac5eb8d9c075debf202bed9d085.

It might be causing camera problems, so revert it for now to see if the
issue goes away.

Bug: 38387976
Change-Id: I46e5fe708185b8028df27d4b1c97abc5d5d70337
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

drivers/pinctrl/qcom/pinctrl-msm.c

diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index 5eba2e0..73178cd 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -754,6 +754,10 @@
 
 	spin_lock_irqsave(&pctrl->lock, flags);
 
+	val = readl(pctrl->regs + g->intr_status_reg);
+	val &= ~BIT(g->intr_status_bit);
+	writel(val, pctrl->regs + g->intr_status_reg);
+
 	val = readl(pctrl->regs + g->intr_cfg_reg);
 	val |= BIT(g->intr_enable_bit);
 	writel(val, pctrl->regs + g->intr_cfg_reg);