summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarender Ankam <nankam@codeaurora.org>2019-07-09 19:38:43 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2020-03-03 02:34:09 -0800
commitfa73fb840fc253b745fbe34af5301f6059ed8301 (patch)
treeb531b9b83dbbd562552d5f3e9a72878d0c94d08e
parent5345bc79e671eec35c17607a01b43a42954c68e4 (diff)
msm: mdss: hdcp: handle hdcp1 mutex properly
HDCP driver is returning without unlocking hdcp1_ta_cmd_lock mutex. Unlock it and then return. Change-Id: Ia2fa1c857516d6fbdd732a6cdbf71236950f88b2 Signed-off-by: Narender Ankam <nankam@codeaurora.org> Signed-off-by: Ramendra Kumar <ramendra@codeaurora.org>
-rw-r--r--drivers/misc/hdcp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/misc/hdcp.c b/drivers/misc/hdcp.c
index be5621a0966d..14b264f57709 100644
--- a/drivers/misc/hdcp.c
+++ b/drivers/misc/hdcp.c
@@ -2332,6 +2332,7 @@ bool hdcp1_check_if_supported_load_app(void)
/* start hdcp1 app */
if (hdcp1_supported && !hdcp1_handle->qsee_handle) {
+ mutex_init(&hdcp1_ta_cmd_lock);
rc = qseecom_start_app(&hdcp1_handle->qsee_handle,
HDCP1_APP_NAME,
QSEECOM_SBUFF_SIZE);
@@ -2345,7 +2346,6 @@ bool hdcp1_check_if_supported_load_app(void)
/* if hdcp1 app succeeds load SRM TA as well */
if (hdcp1_supported && !hdcp1_handle->srm_handle) {
- mutex_init(&hdcp1_ta_cmd_lock);
rc = qseecom_start_app(&hdcp1_handle->srm_handle,
SRMAPP_NAME,
QSEECOM_SBUFF_SIZE);
@@ -2577,8 +2577,10 @@ int hdcp1_set_enc(bool enable)
hdcp1_qsee_handle = hdcp1_handle->qsee_handle;
- if (!hdcp1_qsee_handle)
- return -EINVAL;
+ if (!hdcp1_qsee_handle) {
+ rc = -EINVAL;
+ goto end;
+ }
if (hdcp1_enc_enabled == enable) {
pr_info("already %s\n", enable ? "enabled" : "disabled");