diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 23:35:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 23:35:59 +0300 |
| commit | 3a979e8c07e3ee9933016368db0a55943b00a089 (patch) | |
| tree | ae736c374725c2c2ef1ee2e01ba44a1dd7026a30 /drivers/mailbox/bcm2835-mailbox.c | |
| parent | a1cdde8c411dbde19863e5104a4a1f218dd07b89 (diff) | |
| parent | f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 (diff) | |
| download | linux-3a979e8c07e3ee9933016368db0a55943b00a089.tar.xz | |
Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- Remove HAS_DMA config dependencies
- New STMicroelectronics STM32 IPCC driver
- Enable QCom driver to run more controllers
- Fixed return code from null to ptr-err for Brcm driver
- Fix kconfig dependencies for the HiSilicon driver
* tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX
mailbox: Add support for Qualcomm SDM845 SoCs
dt-bindings: mailbox: Add APSS shared binding for SDM845 SoCs
mailbox: bcm2835: Fix of_xlate return value
mailbox: qcom: Add msm8998 hmss compatible
mailbox: add STMicroelectronics STM32 IPCC driver
dt-bindings: mailbox: add STMicroelectronics STM32 IPCC binding
mailbox: Remove depends on HAS_DMA in case of platform dependency
Diffstat (limited to 'drivers/mailbox/bcm2835-mailbox.c')
| -rw-r--r-- | drivers/mailbox/bcm2835-mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c index cfb4b4496dd9..e92bbc533821 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -134,7 +134,7 @@ static struct mbox_chan *bcm2835_mbox_index_xlate(struct mbox_controller *mbox, const struct of_phandle_args *sp) { if (sp->args_count != 0) - return NULL; + return ERR_PTR(-EINVAL); return &mbox->chans[0]; } |