summaryrefslogtreecommitdiff
path: root/drivers/firmware
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-01-10 20:52:11 +0300
committerIngo Molnar <mingo@kernel.org>2020-01-10 20:52:11 +0300
commit02df083201272c0c2e061b18d9c20635974abf6d (patch)
tree788321ae7a4867c4c06bd1d070cb98d49d009b76 /drivers/firmware
parent0679715e714345d273c0e1eb78078535ffc4b2a1 (diff)
parentbef1d88263ff769f15aa0e1515cdcede84e61d15 (diff)
downloadlinux-02df083201272c0c2e061b18d9c20635974abf6d.tar.xz
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/broadcom/tee_bnxt_fw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c
index 5b7ef89eb701..ed10da5313e8 100644
--- a/drivers/firmware/broadcom/tee_bnxt_fw.c
+++ b/drivers/firmware/broadcom/tee_bnxt_fw.c
@@ -215,7 +215,6 @@ static int tee_bnxt_fw_probe(struct device *dev)
fw_shm_pool = tee_shm_alloc(pvt_data.ctx, MAX_SHM_MEM_SZ,
TEE_SHM_MAPPED | TEE_SHM_DMA_BUF);
if (IS_ERR(fw_shm_pool)) {
- tee_client_close_context(pvt_data.ctx);
dev_err(pvt_data.dev, "tee_shm_alloc failed\n");
err = PTR_ERR(fw_shm_pool);
goto out_sess;