diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-12 11:23:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-14 17:22:22 +0100 |
| commit | 842a8824274de3fbbc8e230355d5c75237453bf5 (patch) | |
| tree | cecfda5c016b60c526972d4a7889fecd888d44ec | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| download | blackbird-obmc-linux-842a8824274de3fbbc8e230355d5c75237453bf5.tar.gz blackbird-obmc-linux-842a8824274de3fbbc8e230355d5c75237453bf5.zip | |
regulator: act8865: Fix missing of_node_put() in act8865_pdata_from_dt()
This node pointer is returned by of_get_child_by_name() with
refcount incremented in this function. of_node_put() is missing
when exitting this function while invalid device type. Fix it
by move of_get_child_by_name() code after device type check.
Found by Coccinelle.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/regulator/act8865-regulator.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index a1cd0d4f8257..7652477e6a9d 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -395,12 +395,6 @@ static int act8865_pdata_from_dt(struct device *dev, struct act8865_regulator_data *regulator; struct of_regulator_match *matches; - np = of_get_child_by_name(dev->of_node, "regulators"); - if (!np) { - dev_err(dev, "missing 'regulators' subnode in DT\n"); - return -EINVAL; - } - switch (type) { case ACT8600: matches = act8600_matches; @@ -419,6 +413,12 @@ static int act8865_pdata_from_dt(struct device *dev, return -EINVAL; } + np = of_get_child_by_name(dev->of_node, "regulators"); + if (!np) { + dev_err(dev, "missing 'regulators' subnode in DT\n"); + return -EINVAL; + } + matched = of_regulator_match(dev, np, matches, num_matches); of_node_put(np); if (matched <= 0) |
