From 73bf8bcd8f29eb282300d94dd164e13fa5f21b88 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@google.com> Date: Thu, 18 May 2017 14:31:21 +0200 Subject: [PATCH] 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 5eba2e0a70d3..73178cdc6105 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -754,6 +754,10 @@ static void msm_gpio_irq_unmask(struct irq_data *d) 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); -- GitLab