aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of/of_reserved_mem.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2019-10-25 09:14:56 -0500
committerRob Herring <robh@kernel.org>2019-10-25 09:14:56 -0500
commitb4e8c0b12debdb680ab801762b003eceaee951c1 (patch)
treea2c5c4b12b4917f39e8505d6abdfbf8996456403 /drivers/of/of_reserved_mem.c
parentdt-bindings: example-schema: Add some additional examples and commentary (diff)
parentof: reserved_mem: add missing of_node_put() for proper ref-counting (diff)
downloadlinux-dev-b4e8c0b12debdb680ab801762b003eceaee951c1.tar.xz
linux-dev-b4e8c0b12debdb680ab801762b003eceaee951c1.zip
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'drivers/of/of_reserved_mem.c')
-rw-r--r--drivers/of/of_reserved_mem.c4
1 files changed, 3 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);