rpmsg: smd: Fail send on a closed channel

Move the check for a closed channel out from the tx-full loop to fail
any send request on a non-open channel.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 0993e95bf0f5..ed167ab52a68 100644
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -743,17 +743,13 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
         if (ret)
                 return ret;
 
-        while (qcom_smd_get_tx_avail(channel) < tlen) {
+        while (qcom_smd_get_tx_avail(channel) < tlen &&
+               channel->state == SMD_CHANNEL_OPENED) {
                 if (!wait) {
                         ret = -EAGAIN;
                         goto out;
                 }
 
-                if (channel->state != SMD_CHANNEL_OPENED) {
-                        ret = -EPIPE;
-                        goto out;
-                }
-
                 SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 0);
 
                 ret = wait_event_interruptible(channel->fblockread_event,
@@ -765,6 +761,12 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
                 SET_TX_CHANNEL_FLAG(channel, fBLOCKREADINTR, 1);
         }
 
+        /* Fail if the channel was closed */
+        if (channel->state != SMD_CHANNEL_OPENED) {
+                ret = -EPIPE;
+                goto out;
+        }
+
         SET_TX_CHANNEL_FLAG(channel, fTAIL, 0);
 
         qcom_smd_write_fifo(channel, hdr, sizeof(hdr));