diff options
author | Linus Torvalds | 2019-07-15 01:36:51 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-07-15 01:36:51 +0200 |
commit | fde7dc63b1caa6dedf9af7cbf79895589629bc95 (patch) | |
tree | b719b754a9b65be628a30a2a9cc041d0f43eeaf6 /drivers/mailbox/mailbox.c | |
parent | Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/denni... (diff) | |
parent | mailbox: handle failed named mailbox channel request (diff) | |
download | kernel-qcow2-linux-fde7dc63b1caa6dedf9af7cbf79895589629bc95.tar.gz kernel-qcow2-linux-fde7dc63b1caa6dedf9af7cbf79895589629bc95.tar.xz kernel-qcow2-linux-fde7dc63b1caa6dedf9af7cbf79895589629bc95.zip |
Merge tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- stm32: race fix by adding a spinlock
- mhu: trim included headers
- omap: add support for K3 SoCs
- imx: Irq disable fix
- bcm: tidy up extracting driver data
- tegra: make resume 'noirq'
- api: fix error handling
* tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: handle failed named mailbox channel request
mailbox: tegra: avoid resume NULL mailboxes
mailbox: tegra: hsp: add noirq resume
mailbox: bcm-flexrm-mailbox: using dev_get_drvdata directly
mailbox: imx: Clear GIEn bit at shutdown
mailbox: omap: Add support for TI K3 SoCs
dt-bindings: mailbox: omap: Update bindings for TI K3 SoCs
mailbox: arm_mhu: reorder header inclusion and drop unneeded ones
mailbox: stm32_ipcc: add spinlock to fix channels concurrent access
Diffstat (limited to 'drivers/mailbox/mailbox.c')
-rw-r--r-- | drivers/mailbox/mailbox.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index f4b1950d35f3..0b821a5b2db8 100644 --- 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); |