diff options
| author |   Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2014-04-03 15:32:15 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-04-14 17:01:24 +0100 |
| commit | bd0dda744cdfb93a1907091c4540764593a28fa2 (patch) | |
| tree | eeb9e2240bf1df9783956089663b4538cbe2180e /drivers/regulator/of_regulator.c | |
| parent | Linux 3.15-rc1 (diff) | |
| download | linux-dev-bd0dda744cdfb93a1907091c4540764593a28fa2.tar.xz linux-dev-bd0dda744cdfb93a1907091c4540764593a28fa2.zip | |
regulator: core: Add of_node_get to of_regulator_match
Currently, of_regulator_match does not increment the reference count of
the of_nodes it takes new references to. This could cause the node
pointer held to be invalid, by the time it is passed to the regulator
core. This patchs adds an of_node_get when we copy each of_node pointer
into the match structure.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/of_regulator.c')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index ea4f36f2cbe2..c58c8d178948 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -119,7 +119,8 @@ EXPORT_SYMBOL_GPL(of_get_regulator_init_data); * regulator. The data parsed from a child node will be matched to a regulator * based on either the deprecated property regulator-compatible if present, * or otherwise the child node's name. Note that the match table is modified - * in place. + * in place and an additional of_node reference is taken for each matched + * regulator. * * Returns the number of matches found or a negative error code on failure. */ @@ -162,7 +163,7 @@ int of_regulator_match(struct device *dev, struct device_node *node, child->name); return -EINVAL; } - match->of_node = child; + match->of_node = of_node_get(child); count++; break; } |