From 91ed5d180dd1eaf17c1ca872b01b998a065e2dcb Mon Sep 17 00:00:00 2001 From: Anmolpreet Kaur Date: Tue, 23 Feb 2021 17:26:46 +0530 Subject: [PATCH] firmware: shmbridge: Change the exit label Make change to create and keep memory pool even shmbridge feature is not supported on certain target, then client can still suballocte memory from the default bridge. Change-Id: I134a8d3a31ff6464b25d4c10e1d4c686be2dee12 Signed-off-by: Anmolpreet Kaur --- drivers/firmware/qtee_shmbridge.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qtee_shmbridge.c b/drivers/firmware/qtee_shmbridge.c index 1883286e6beb..9708509bbded 100644 --- a/drivers/firmware/qtee_shmbridge.c +++ b/drivers/firmware/qtee_shmbridge.c @@ -2,7 +2,7 @@ /* * QTI TEE shared memory bridge driver * - * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2020,2021 The Linux Foundation. All rights reserved. */ #include @@ -436,7 +436,7 @@ static int qtee_shmbridge_init(struct platform_device *pdev) if (ret) { /* keep the mem pool and return if failed to enable bridge */ ret = 0; - goto exit_shmbridge_enable; + goto exit; } /*register default bridge*/ @@ -464,7 +464,6 @@ static int qtee_shmbridge_init(struct platform_device *pdev) exit_deregister_default_bridge: qtee_shmbridge_deregister(default_bridge.handle); -exit_shmbridge_enable: qtee_shmbridge_enable(false); exit_destroy_pool: gen_pool_destroy(default_bridge.genpool); @@ -474,7 +473,7 @@ exit_unmap: exit_freebuf: free_pages((long)default_bridge.vaddr, get_order(default_bridge.size)); default_bridge.vaddr = NULL; -//exit: +exit: return ret; }