diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-11 12:37:19 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-11 12:37:19 -0300 |
| commit | 467cd948f8a92086441dd9b9859885132f1adc35 (patch) | |
| tree | df940b0e885f7c670ecf80249aeb760b2d09a663 /drivers/gpio/gpio-pca953x.c | |
| parent | cad10ce36671c99dde850de7bd4ca0d8df66c47f (diff) | |
| parent | feb9c5e19e913b53cb536a7aa7c9f20107bb51ec (diff) | |
| download | linux-467cd948f8a92086441dd9b9859885132f1adc35.tar.gz linux-467cd948f8a92086441dd9b9859885132f1adc35.tar.bz2 linux-467cd948f8a92086441dd9b9859885132f1adc35.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
Get fixes sent via perf/urgent, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 4 |
1 files 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); |