diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:02:43 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:02:43 +0200 |
commit | bd9c67ad9693bacef086d65c1c6744645d4777e7 (patch) | |
tree | 1dcbac332819a79dbaa1a1a836a8485f866568ad /drivers/firmware/arm_scmi/driver.c | |
parent | 861410270ab5b13f72fc9afc74fa60f3eb7c2b7e (diff) | |
parent | b50694381cfc22dce3a60a291cdae294a5e5777c (diff) | |
download | linux-bd9c67ad9693bacef086d65c1c6744645d4777e7.tar.gz linux-bd9c67ad9693bacef086d65c1c6744645d4777e7.tar.bz2 linux-bd9c67ad9693bacef086d65c1c6744645d4777e7.zip |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/arm_scmi/driver.c')
-rw-r--r-- | drivers/firmware/arm_scmi/driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 14b147135a0c..2455be8cbc4f 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -778,6 +778,7 @@ scmi_create_protocol_device(struct device_node *np, struct scmi_info *info, if (scmi_mbox_chan_setup(info, &sdev->dev, prot_id)) { dev_err(&sdev->dev, "failed to setup transport\n"); scmi_device_destroy(sdev); + return; } /* setup handle now as the transport is ready */ |