evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qseecom: support listener request from smcinvoke without reentrancy"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-16 00:56:46 -08:00 • committed by Gerrit - the friendly Code Review server
commit 02a73d4553
1 changed files with 5 additions and 1 deletions

6
drivers/misc/qseecom.c
View file

@ -4787,8 +4787,12 @@ int qseecom_process_listener_from_smcinvoke(struct scm_desc *desc)
resp.data = desc->ret[2]; /*listener_id*/ resp.data = desc->ret[2]; /*listener_id*/
mutex_lock(&app_access_lock); mutex_lock(&app_access_lock);
ret = __qseecom_process_reentrancy(&resp, &dummy_app_entry, if (qseecom.qsee_reentrancy_support)
ret = __qseecom_process_reentrancy(&resp, &dummy_app_entry,
&dummy_private_data); &dummy_private_data);
else
ret = __qseecom_process_incomplete_cmd(&dummy_private_data,
&resp);
mutex_unlock(&app_access_lock); mutex_unlock(&app_access_lock);
if (ret) if (ret)
pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n", pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n",