rpmsg: smd: Fix double unlock in __qcom_smd_send()

We're not holding the lock here, so we shouldn't unlock.

Fixes: 178f3f75bb4e ("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>

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 10870189c0c843b088d6befc85fbb3612fe98f06..e92fd0129658938f65e3379c0295fa2682f1df23 100644 (file)
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -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;