Commit b4e8c0b1 authored by Rob Herring's avatar Rob Herring

Merge branch 'dt/linus' into dt/next

parents 58fbe999 5dba5175
...@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, ...@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
if (!target) if (!target)
return -ENODEV; return -ENODEV;
if (!of_device_is_available(target)) if (!of_device_is_available(target)) {
of_node_put(target);
return 0; return 0;
}
rmem = __find_rmem(target); rmem = __find_rmem(target);
of_node_put(target); of_node_put(target);
......
...@@ -1297,6 +1297,7 @@ static int __init unittest_data_add(void) ...@@ -1297,6 +1297,7 @@ static int __init unittest_data_add(void)
of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node); of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node);
if (!unittest_data_node) { if (!unittest_data_node) {
pr_warn("%s: No tree to attach; not running tests\n", __func__); pr_warn("%s: No tree to attach; not running tests\n", __func__);
kfree(unittest_data);
return -ENODATA; return -ENODATA;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment