Skip to content

Commit

Permalink
Merge tag 'optee-fix-for-v5.18' of git://git.linaro.org/people/jens.w…
Browse files Browse the repository at this point in the history
…iklander/linux-tee into arm/fixes

OP-TEE fix missing mutex_destroy in probe error handling path

* tag 'optee-fix-for-v5.18' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: add missing mutext_destroy in optee_ffa_probe

Link: https://lore.kernel.org/r/20220413052001.GA49798@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
arndb committed Apr 14, 2022
2 parents 1808b18 + b5e2288 commit c834eff
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/tee/optee/ffa_abi.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
optee_supp_uninit(&optee->supp);
mutex_destroy(&optee->call_queue.mutex);
mutex_destroy(&optee->ffa.mutex);
err_unreg_supp_teedev:
tee_device_unregister(optee->supp_teedev);
err_unreg_teedev:
Expand Down

0 comments on commit c834eff

Please sign in to comment.