regulator: act8865: Fix missing of_node_put() in act8865_pdata_from_dt()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 12 Jul 2016 11:23:50 +0000 (11:23 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 14 Jul 2016 16:22:22 +0000 (17:22 +0100)
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>
drivers/regulator/act8865-regulator.c

index a1cd0d4f82572424aad60054736be221db538304..7652477e6a9df95cb4b43c0ef7753886250371fd 100644 (file)
@@ -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)