Unverified Commit c834eff5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'optee-fix-for-v5.18' of... 

Merge tag 'optee-fix-for-v5.18' of git://git.linaro.org/people/jens.wiklander/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: default avatarArnd Bergmann <arnd@arndb.de>
parents 1808b184 b5e22886

drivers/tee/optee/ffa_abi.c

+1 −0
Original line number Diff line number Diff line
@@ -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: