All callers of of_init_opp_table() are required to take reference of
dev->of_node, by initiating calls to of_node_{get|put}(), before and after
calling of_init_opp_table().
Its better to call these from within of_init_opp_table(), no fun adding
redundant code to every caller.
Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>
---
V4->V5: do of_node_put() on errors as well
drivers/base/power/opp.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 89ced95..28696af 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -643,13 +643,21 @@ int of_init_opp_table(struct device *dev)
{
const struct property *prop;
const __be32 *val;
- int nr;
+ int nr, ret = 0;
- prop = of_find_property(dev->of_node, "operating-points", NULL);
- if (!prop)
+ if (!of_node_get(dev->of_node))
return -ENODEV;
- if (!prop->value)
- return -ENODATA;
+
+ prop = of_find_property(dev->of_node, "operating-points", NULL);
+ if (!prop) {
+ ret = -ENODEV;
+ goto out;
+ }
+
+ if (!prop->value) {
+ ret = -ENODATA;
+ goto out;
+ }
/*
* Each OPP is a set of tuples consisting of frequency and
@@ -658,7 +666,8 @@ int of_init_opp_table(struct device *dev)
nr = prop->length / sizeof(u32);
if (nr % 2) {
dev_err(dev, "%s: Invalid OPP list\n", __func__);
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
val = prop->value;
@@ -672,6 +681,8 @@ int of_init_opp_table(struct device *dev)
nr -= 2;
}
+out:
+ of_node_put(dev->of_node);
return 0;
}
EXPORT_SYMBOL_GPL(of_init_opp_table);
--
2.0.0.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
