From: André Draszik <redacted>
The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc.
This driver here should only return IRQ_HANDLED if the status register
indicates that the event we're handling in the irq handler was genuinely
intended for this driver. Otheriwse the interrupt subsystem will
assume the interrupt was handled successfully even though it wasn't
at all.
Signed-off-by: André Draszik <redacted>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
drivers/input/keyboard/snvs_pwrkey.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
index 382d2ae82c9b..980867886b34 100644
--- a/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@ -82,7 +82,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
clk_enable(pdata->clk);
regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status);
- if (lp_status & SNVS_LPSR_SPO) {
+ lp_status &= SNVS_LPSR_SPO;
+
+ if (lp_status) {
if (pdata->minor_rev == 0) {
/*
* The first generation i.MX[6|7] SoCs only send an@@ -98,14 +100,14 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
mod_timer(&pdata->check_timer,
jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
}
- }
- /* clear SPO status */
- regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO);
+ /* clear SPO status */
+ regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO);
+ }
clk_disable(pdata->clk);
- return IRQ_HANDLED;
+ return lp_status ? IRQ_HANDLED : IRQ_NONE;
}
static void imx_snvs_pwrkey_act(void *pdata)
--
2.17.1