diff options
author | Mark Brown <broonie@kernel.org> | 2019-04-25 21:27:00 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-04-25 21:27:00 +0200 |
commit | 7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4 (patch) | |
tree | 92f42d689160b1641a9b7c62795f0dd0e11ca258 /drivers/base | |
parent | Linux 5.1-rc6 (diff) | |
parent | regmap: regmap-irq: fix getting type default values (diff) | |
download | linux-7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4.tar.xz linux-7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4.zip |
Merge branch 'regmap-5.1' into regmap-linus
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/regmap/regmap-irq.c | 3 |
1 files changed, 0 insertions, 3 deletions
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); |