From: Mark Brown <broonie@kernel.org>
Date: Thu, 25 Apr 2019 19:27:00 +0000 (+0100)
Subject: Merge branch 'regmap-5.1' into regmap-linus
X-Git-Tag: for-linus-20190516~98^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4;hp=085b7755808aa11f78ab9377257e1dad2e6fa4bb;p=linux-2.6-block.git

Merge branch 'regmap-5.1' into regmap-linus
---

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 5059748afd4c..02eb75646141 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -761,9 +761,6 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
 
 	if (chip->num_type_reg && !chip->type_in_mask) {
 		for (i = 0; i < chip->num_type_reg; ++i) {
-			if (!d->type_buf_def[i])
-				continue;
-
 			reg = chip->type_base +
 				(i * map->reg_stride * d->type_reg_stride);