Merge tag ‘tee-fix-for-v5.0’ of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes [Linux 5.0]

Merge tag ‘tee-fix-for-v5.0’ of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes [Linux 5.0]

This Linux kernel change "Merge tag ‘tee-fix-for-v5.0’ of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes" is included in the Linux 5.0 release. This change is authored by Arnd Bergmann <arnd [at] arndb.de> on Fri Mar 1 14:59:40 2019 +0100. The commit for this change in Linux stable tree is 36baa6e (patch). Other info about this change: Merge: 014e90c c7c0d8d

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

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/tee/optee/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e5efce3..947f9b2 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);

Leave a Reply

Your email address will not be published. Required fields are marked *