summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2020-05-09 09:33:37 +0000
committerMark Brown <broonie@kernel.org>2020-05-11 12:24:59 +0100
commit7d8785bc7adbb4dc5ba8ee06994107637848ded8 (patch)
treec59b8456fadd0ae5fa0159ceabd80e07419eb240
parentd9a2d100c96d3ae6253926e3f11c55242907a30c (diff)
downloadlinux-stable-7d8785bc7adbb4dc5ba8ee06994107637848ded8.tar.gz
linux-stable-7d8785bc7adbb4dc5ba8ee06994107637848ded8.tar.bz2
linux-stable-7d8785bc7adbb4dc5ba8ee06994107637848ded8.zip
ASoC: SOF: core: fix error return code in sof_probe_continue()
Fix to return negative error code -ENOMEM from the IPC init error handling case instead of 0, as done elsewhere in this function. Fixes: c16211d6226d ("ASoC: SOF: Add Sound Open Firmware driver core") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20200509093337.78897-1-weiyongjun1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sof/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 94a2cb58ab9a..ef9be4f45e27 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -176,6 +176,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
/* init the IPC */
sdev->ipc = snd_sof_ipc_init(sdev);
if (!sdev->ipc) {
+ ret = -ENOMEM;
dev_err(sdev->dev, "error: failed to init DSP IPC %d\n", ret);
goto ipc_err;
}