diff options
| author |   Rob Herring <robh@kernel.org> | 2019-10-25 09:14:56 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2019-10-25 09:14:56 -0500 |
| commit | b4e8c0b12debdb680ab801762b003eceaee951c1 (patch) | |
| tree | a2c5c4b12b4917f39e8505d6abdfbf8996456403 /drivers/of | |
| parent | dt-bindings: example-schema: Add some additional examples and commentary (diff) | |
| parent | of: reserved_mem: add missing of_node_put() for proper ref-counting (diff) | |
| download | linux-dev-b4e8c0b12debdb680ab801762b003eceaee951c1.tar.xz linux-dev-b4e8c0b12debdb680ab801762b003eceaee951c1.zip | |
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 4 | ||||
| -rw-r--r-- | drivers/of/unittest.c | 1 |
2 files changed, 4 insertions, 1 deletions
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 141f23aa4a6b..445f134b62c0 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1297,6 +1297,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; } |