From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Tue, 17 Jun 2014 22:44:49 +0200 Subject: [PATCH v4 4/7] regulator: axp20x: reset probe data before each probe In-Reply-To: <1402990723-28138-5-git-send-email-boris.brezillon@free-electrons.com> References: <1402990723-28138-1-git-send-email-boris.brezillon@free-electrons.com> <1402990723-28138-5-git-send-email-boris.brezillon@free-electrons.com> Message-ID: <20140617204449.GD19730@lukather> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jun 17, 2014 at 09:38:40AM +0200, Boris BREZILLON wrote: > 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 > --- > 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; > + } > + That looks rather hackish, especially since we've never been in such a case yet, since we have a single PMIC in our system. Can't you just use memzero here? Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: