Merge branch 'regmap-4.21' into regmap-5.0

1cd82436 · Mark Brown · bfeffd15 · 74d4b4e0 · 1cd82436
Unverified Commit 1cd82436 authored 6 years ago by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/base/regmap/regmap-irq.c drivers/base/regmap/regmap-irq.c +1 -1

No files found.
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -258,7 +258,7 @@ static int regmap_irq_set_type(struct irq_data *data, unsigned int type)
 	const struct regmap_irq_type *t = &irq_data->type;

 	if ((t->types_supported & type) != type)
-		return -ENOTSUPP;
+		return 0;

 	reg = t->type_reg_offset / map->reg_stride;