Merge tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / mailbox / mailbox.c

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index f4b1950d35f3a9f9008f28e1c5c391297ba56c8f..0b821a5b2db844ef44ccb9c60a96a10b9a2a29d2 100644 (file)
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -418,11 +418,13 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl,
 
        of_property_for_each_string(np, "mbox-names", prop, mbox_name) {
                if (!strncmp(name, mbox_name, strlen(name)))
-                       break;
+                       return mbox_request_channel(cl, index);
                index++;
        }
 
-       return mbox_request_channel(cl, index);
+       dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n",
+               __func__, name);
+       return ERR_PTR(-EINVAL);
 }
 EXPORT_SYMBOL_GPL(mbox_request_channel_byname);