leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpmsg: glink: Unlock on error in qcom_glink_request_intent()

Browse Source 
If qcom_glink_tx() fails, then we need to unlock before returning the
error code.

Fixes: 27b9c5b66b ("rpmsg: glink: Request for intents when unavailable")
Acked-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Dan Carpenter 2017-09-08 13:33:45 +03:00 committed by Bjorn Andersson
parent 2bd6bf03f4
commit 0a7480bd32
1 changed files with 2 additions and 1 deletions

3
drivers/rpmsg/qcom_glink_native.c
View File

@ -1197,7 +1197,7 @@ static int qcom_glink_request_intent(struct qcom_glink *glink,
ret = qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true); ret = qcom_glink_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);
if (ret) if (ret)
return ret; goto unlock;
ret = wait_for_completion_timeout(&channel->intent_req_comp, 10 * HZ); ret = wait_for_completion_timeout(&channel->intent_req_comp, 10 * HZ);
if (!ret) { if (!ret) {
@ -1207,6 +1207,7 @@ static int qcom_glink_request_intent(struct qcom_glink *glink,
ret = channel->intent_req_result ? 0 : -ECANCELED; ret = channel->intent_req_result ? 0 : -ECANCELED;
} }
unlock:
mutex_unlock(&channel->intent_req_lock); mutex_unlock(&channel->intent_req_lock);
return ret; return ret;
} }