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

Mark Brown
2 parents cce585ce1e d23511f959
Showing 1 changed file Side-by-side Diff
drivers/base/regmap/regmap-irq.c
@@ -100,6 +100,7 @@
 	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 @@
 		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;
 }
  
 /**
...	...	@@ -100,6 +100,7 @@
100	100	u8 *buf8 = data->status_reg_buf;
101	101	u16 *buf16 = data->status_reg_buf;
102	102	u32 *buf32 = data->status_reg_buf;
	103	+ bool handled = false;
103	104
104	105	ret = regmap_bulk_read(map, chip->status_base, data->status_reg_buf,
105	106	chip->num_regs);
106	107
...	...	@@ -146,10 +147,14 @@
146	147	if (data->status_buf[chip->irqs[i].reg_offset] &
147	148	chip->irqs[i].mask) {
148	149	handle_nested_irq(data->irq_base + i);
	150	+ handled = true;
149	151	}
150	152	}
151	153
152		- return IRQ_HANDLED;
	154	+ if (handled)
	155	+ return IRQ_HANDLED;
	156	+ else
	157	+ return IRQ_NONE;
153	158	}
154	159
155	160	/**