Merge tag ‘qcom-fixes-for-5.0-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/fixes [Linux 5.0]

Merge tag ‘qcom-fixes-for-5.0-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/fixes [Linux 5.0]

This Linux kernel change "Merge tag ‘qcom-fixes-for-5.0-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux 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 15:08:16 2019 +0100. The commit for this change in Linux stable tree is 6089e65 (patch). Other info about this change: Merge: 36baa6e 6e53330

Merge tag 'qcom-fixes-for-5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/fixes

Qualcomm ARM64 Fixes for 5.0-rc8

* Fix TZ memory area size to avoid crashes during boot

* tag 'qcom-fixes-for-5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: qcom: msm8998: Extend TZ reserved memory area

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 *