diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-16 00:56:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-16 00:56:46 -0800 |
| commit | 02a73d4553b036e9dd44b02a7ca874dc0555f86b (patch) | |
| tree | 6a2953efc88ce77db9fca209cc45dab55140d5d7 | |
| parent | dd2fb75a0c844da2cbfe11370c74d1f46a3c01f1 (diff) | |
| parent | f20c33ce06540f018a45c04156c38f1eaca23e7f (diff) | |
Merge "qseecom: support listener request from smcinvoke without reentrancy"
| -rw-r--r-- | drivers/misc/qseecom.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index a05e028200fa..16dd7dd37f78 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -4787,8 +4787,12 @@ int qseecom_process_listener_from_smcinvoke(struct scm_desc *desc) resp.data = desc->ret[2]; /*listener_id*/ 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); + else + ret = __qseecom_process_incomplete_cmd(&dummy_private_data, + &resp); mutex_unlock(&app_access_lock); if (ret) pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n", |