mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
rpmsg: smd: Fix double unlock in __qcom_smd_send()
We're not holding the lock here, so we shouldn't unlock.
Fixes: 178f3f75bb
("rpmsg: smd: Don't hold the tx lock during wait")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[bjorn: renamed "out" label to further distinguish the two exit paths]
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
fb416f6990
commit
c3388a075c
1 changed files with 5 additions and 5 deletions
|
@ -747,7 +747,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
|
|||
channel->state == SMD_CHANNEL_OPENED) {
|
||||
if (!wait) {
|
||||
ret = -EAGAIN;
|
||||
goto out;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 0);
|
||||
|
@ -759,11 +759,11 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
|
|||
qcom_smd_get_tx_avail(channel) >= tlen ||
|
||||
channel->state != SMD_CHANNEL_OPENED);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = mutex_lock_interruptible(&channel->tx_lock);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 1);
|
||||
}
|
||||
|
@ -771,7 +771,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
|
|||
/* Fail if the channel was closed */
|
||||
if (channel->state != SMD_CHANNEL_OPENED) {
|
||||
ret = -EPIPE;
|
||||
goto out;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
SET_TX_CHANNEL_FLAG(channel, fTAIL, 0);
|
||||
|
@ -786,7 +786,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
|
|||
|
||||
qcom_smd_signal_channel(channel);
|
||||
|
||||
out:
|
||||
out_unlock:
|
||||
mutex_unlock(&channel->tx_lock);
|
||||
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue