diff options
author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2017-03-14 11:23:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-31 04:31:45 -0400 |
commit | dd6054234bd82065134f62ca0b5e2695c0d859b7 (patch) | |
tree | 2bdbb4768426f9ad3f3ff0832e932c96c48861f3 | |
parent | b82b2f930c2b090a51d429664454252c87b45a47 (diff) |
pinctrl: qcom: Don't clear status bit on irq_unmask
commit a6566710adaa4a7dd5e0d99820ff9c9c30ee5951 upstream.
Clearing the status bit on irq_unmask will discard any pending interrupt
that did arrive after the irq_ack, i.e. while the IRQ handler function
was executing.
Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver")
Cc: Stephen Boyd <sboyd@codeaurora.org>
Reported-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/pinctrl/qcom/pinctrl-msm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 775c88303017..bedce3453dd3 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c | |||
@@ -594,10 +594,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d) | |||
594 | 594 | ||
595 | spin_lock_irqsave(&pctrl->lock, flags); | 595 | spin_lock_irqsave(&pctrl->lock, flags); |
596 | 596 | ||
597 | val = readl(pctrl->regs + g->intr_status_reg); | ||
598 | val &= ~BIT(g->intr_status_bit); | ||
599 | writel(val, pctrl->regs + g->intr_status_reg); | ||
600 | |||
601 | val = readl(pctrl->regs + g->intr_cfg_reg); | 597 | val = readl(pctrl->regs + g->intr_cfg_reg); |
602 | val |= BIT(g->intr_enable_bit); | 598 | val |= BIT(g->intr_enable_bit); |
603 | writel(val, pctrl->regs + g->intr_cfg_reg); | 599 | writel(val, pctrl->regs + g->intr_cfg_reg); |