[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1402990723-28138-5-git-send-email-boris.brezillon@free-electrons.com>
Date: Tue, 17 Jun 2014 09:38:40 +0200
From: Boris BREZILLON <boris.brezillon@...e-electrons.com>
To: Samuel Ortiz <sameo@...ux.intel.com>,
Lee Jones <lee.jones@...aro.org>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>
Cc: Maxime Ripard <maxime.ripard@...e-electrons.com>,
Carlo Caione <carlo@...one.org>,
Shuge <shuge@...winnertech.com>, kevin@...winnertech.com,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
devicetree@...r.kernel.org, linux-doc@...r.kernel.org,
dev@...ux-sunxi.org,
Boris BREZILLON <boris.brezillon@...e-electrons.com>
Subject: [PATCH v4 4/7] regulator: axp20x: reset probe data before each probe
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@...e-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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists