Merge remote-tracking branch 'regmap/topic/irq' into regmap-next

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index bd54f63be9ed..6b8a74c3ed18 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -100,6 +100,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
         u8 *buf8 = data->status_reg_buf;
         u16 *buf16 = data->status_reg_buf;
         u32 *buf32 = data->status_reg_buf;
+        bool handled = false;
 
         ret = regmap_bulk_read(map, chip->status_base, data->status_reg_buf,
                                chip->num_regs);
@@ -146,10 +147,14 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
                 if (data->status_buf[chip->irqs[i].reg_offset] &
                     chip->irqs[i].mask) {
                         handle_nested_irq(data->irq_base + i);
+                        handled = true;
                 }
         }
 
-        return IRQ_HANDLED;
+        if (handled)
+                return IRQ_HANDLED;
+        else
+                return IRQ_NONE;
 }
 
 /**