aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-03-01 14:59:40 +0100
committerArnd Bergmann <arnd@arndb.de>2019-03-01 14:59:40 +0100
commit36baa6ed1cef280690b6240ff37a97f6299a02af (patch)
treec26f01640d3c3839c9e5ebb10f0f3b07d97ed9fb
parentARM: dts: gemini: Re-enable display controller (diff)
parenttee: optee: add missing of_node_put after of_device_is_available (diff)
downloadlinux-dev-36baa6ed1cef280690b6240ff37a97f6299a02af.tar.xz
linux-dev-36baa6ed1cef280690b6240ff37a97f6299a02af.zip
Merge tag 'tee-fix-for-v5.0' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes
OP-TEE driver - add missing of_node_put after of_device_is_available * tag 'tee-fix-for-v5.0' of https://git.linaro.org/people/jens.wiklander/linux-tee: tee: optee: add missing of_node_put after of_device_is_available
-rw-r--r--drivers/tee/optee/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e5efce3c08e2..947f9b28de9e 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -699,8 +699,10 @@ static int __init optee_driver_init(void)
return -ENODEV;
np = of_find_matching_node(fw_np, optee_match);
- if (!np || !of_device_is_available(np))
+ if (!np || !of_device_is_available(np)) {
+ of_node_put(np);
return -ENODEV;
+ }
optee = optee_probe(np);
of_node_put(np);