From dba785798526a3282cc4d0f0ea751883715dbbb4 Mon Sep 17 00:00:00 2001

From: Puyou Lu <puyou.lu@gmail.com>

Date: Fri, 6 May 2022 16:06:30 +0800

Subject: [PATCH] gpio: pca953x: fix irq_stat not updated when irq is disabled (irq_mask not set)

Git-commit: dba785798526a3282cc4d0f0ea751883715dbbb4

Patch-mainline: v5.18-rc6

References: git-fixes

When one port's input state get inverted (eg. from low to hight) after

pca953x_irq_setup but before setting irq_mask (by some other driver such as

"gpio-keys"), the next inversion of this port (eg. from hight to low) will not

be triggered any more (because irq_stat is not updated at the first time). Issue

should be fixed after this commit.

Fixes: 89ea8bbe9c3e ("gpio: pca953x.c: add interrupt handling capability")

Signed-off-by: Puyou Lu <puyou.lu@gmail.com>

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpio/gpio-pca953x.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c

index d2fe76f3f34f..8726921a1129 100644

--- a/drivers/gpio/gpio-pca953x.c

+++ b/drivers/gpio/gpio-pca953x.c

@@ -762,11 +762,11 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, unsigned long *pendin

 	bitmap_xor(cur_stat, new_stat, old_stat, gc->ngpio);

 	bitmap_and(trigger, cur_stat, chip->irq_mask, gc->ngpio);

+	bitmap_copy(chip->irq_stat, new_stat, gc->ngpio);

+

 	if (bitmap_empty(trigger, gc->ngpio))

 		return false;

-	bitmap_copy(chip->irq_stat, new_stat, gc->ngpio);

-

 	bitmap_and(cur_stat, chip->irq_trig_fall, old_stat, gc->ngpio);

 	bitmap_and(old_stat, chip->irq_trig_raise, new_stat, gc->ngpio);

 	bitmap_or(new_stat, old_stat, cur_stat, gc->ngpio);

-- 

2.31.1