[PATCH v4 4/7] regulator: axp20x: reset probe data before each probe
Boris BREZILLON
boris.brezillon at free-electrons.com
Tue Jun 17 00:38:40 PDT 2014
The init_data and of_node fields of the axp2xx_matches tables are filled
at each device probe by the axp20x_regulator_parse_dt function (which then
calls the of_regulator_match function).
This means we can probe a new device and consider data initialized during
the probe of another device as valid.
Reset init_data and of_node field to NULL before each probe in order to
avoid this kind of issue.
Signed-off-by: Boris BREZILLON <boris.brezillon at free-electrons.com>
---
drivers/regulator/axp20x-regulator.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 7a30f49..d42bf6d 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -324,6 +324,15 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
nregulators = AXP20X_REG_ID_MAX;
}
+ /*
+ * Reset matches table (this table might have been modified by a
+ * previous AXP2xx device probe).
+ */
+ for (i = 0; i < nmatches; i++) {
+ matches[i].init_data = NULL;
+ matches[i].of_node = NULL;
+ }
+
ret = axp20x_regulator_parse_dt(pdev, matches, nmatches);
if (ret)
return ret;
--
1.8.3.2
More information about the linux-arm-kernel
mailing list