PM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach()

anholt · rafaeljw · commit 265e2cf672aa · 2015-12-04T01:21:17.000+01:00
It looks like these meant to be unreffing the of_parse_phandle_with_args() node, since the error paths above it don't do of_node_put. That function returns a new ref in pd_args.np, though, not a new ref on dev->of_node. Also, it would have leaked the ref in the success case. Fixes "ERROR: Bad of_node_put()" on bcm2835 in the -EPROBE_DEFER case. Fixes: aa42240 (PM / Domains: Add generic OF-based PM domain look-up) Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Kevin Hilman <khilman@linaro.org> Cc: 3.18+ <stable@vger.kernel.org> # 3.18+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -1773,10 +1773,10 @@ int genpd_dev_pm_attach(struct device *dev)
 	}
 
 	pd = of_genpd_get_from_provider(&pd_args);
+	of_node_put(pd_args.np);
 	if (IS_ERR(pd)) {
 		dev_dbg(dev, "%s() failed to find PM domain: %ld\n",
 			__func__, PTR_ERR(pd));
-		of_node_put(dev->of_node);
 		return -EPROBE_DEFER;
 	}
 
@@ -1794,7 +1794,6 @@ int genpd_dev_pm_attach(struct device *dev)
 	if (ret < 0) {
 		dev_err(dev, "failed to add to PM domain %s: %d",
 			pd->name, ret);
-		of_node_put(dev->of_node);
 		goto out;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1773,10 +1773,10 @@ int genpd_dev_pm_attach(struct device *dev)`
`1773`	`1773`	`}`
`1774`	`1774`
`1775`	`1775`	`pd = of_genpd_get_from_provider(&pd_args);`
	`1776`	`+ of_node_put(pd_args.np);`
`1776`	`1777`	`if (IS_ERR(pd)) {`
`1777`	`1778`	`dev_dbg(dev, "%s() failed to find PM domain: %ld\n",`
`1778`	`1779`	`__func__, PTR_ERR(pd));`
`1779`		`- of_node_put(dev->of_node);`
`1780`	`1780`	`return -EPROBE_DEFER;`
`1781`	`1781`	`}`
`1782`	`1782`
`@@ -1794,7 +1794,6 @@ int genpd_dev_pm_attach(struct device *dev)`
`1794`	`1794`	`if (ret < 0) {`
`1795`	`1795`	`dev_err(dev, "failed to add to PM domain %s: %d",`
`1796`	`1796`	`pd->name, ret);`
`1797`		`- of_node_put(dev->of_node);`
`1798`	`1797`	`goto out;`
`1799`	`1798`	`}`
`1800`	`1799`