author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2019-10-27 18:54:13 +0100
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2019-10-27 18:54:13 +0100
commit: 8f677bc819e7a74cf10e30daf06e8b151d1e6a94
parent: a3caeb8ffe5d2bbe01da66081f0ef28c26302d99
Commit Summary:
Diffstat:
2 files changed, 4 insertions, 1 deletion
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 7989703b883c..6bd610ee2cd7 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
if (!target)
return -ENODEV;
- if (!of_device_is_available(target))
+ if (!of_device_is_available(target)) {
+ of_node_put(target);
return 0;
+ }
rmem = __find_rmem(target);
of_node_put(target);
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 480a21e2ed39..92e895d86458 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1207,6 +1207,7 @@ static int __init unittest_data_add(void)
of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node);
if (!unittest_data_node) {
pr_warn("%s: No tree to attach; not running tests\n", __func__);
+ kfree(unittest_data);
return -ENODATA;
}