summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-01-07 12:42:14 +0000
committerMark Brown <broonie@kernel.org>2019-01-07 12:42:14 +0000
commit1cd824361eed0f3621e32df1be15159c91f137d9 (patch)
tree6b10a27ddedfba7e6770614e81110d3aabb57555 /drivers/base
parentbfeffd155283772bbe78c6a05dec7c0128ee500c (diff)
parent74d4b4e0f43e5ffb61b63f4e3cfcfad3d7398765 (diff)
Merge branch 'regmap-4.21' into regmap-5.0
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 1bd1145ad8b5..d2d0014b0d23 100644
--- 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;