Merge tag 'rpmsg-v4.10' of git://github.com/andersson/remoteproc

[linux-2.6-microblaze.git] / drivers / rpmsg / qcom_smd.c

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 394a1b5..0fae481 100644 (file)
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -740,7 +740,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
 
        while (qcom_smd_get_tx_avail(channel) < tlen) {
                if (!wait) {
-                       ret = -ENOMEM;
+                       ret = -EAGAIN;
                        goto out;
                }
 
@@ -821,20 +821,13 @@ qcom_smd_find_channel(struct qcom_smd_edge *edge, const char *name)
        struct qcom_smd_channel *channel;
        struct qcom_smd_channel *ret = NULL;
        unsigned long flags;
-       unsigned state;
 
        spin_lock_irqsave(&edge->channels_lock, flags);
        list_for_each_entry(channel, &edge->channels, list) {
-               if (strcmp(channel->name, name))
-                       continue;
-
-               state = GET_RX_CHANNEL_INFO(channel, state);
-               if (state != SMD_CHANNEL_OPENING &&
-                   state != SMD_CHANNEL_OPENED)
-                       continue;
-
-               ret = channel;
-               break;
+               if (!strcmp(channel->name, name)) {
+                       ret = channel;
+                       break;
+               }
        }
        spin_unlock_irqrestore(&edge->channels_lock, flags);