diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2020-05-09 09:33:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-24 17:50:25 +0200 |
| commit | 6544b95bd789bf79dd0e87a8ccb0eb0ce79431a7 (patch) | |
| tree | 6a18cceebeb571c67d736108d5c9c11355ccf147 /sound/soc | |
| parent | 79790202d4f3772447403089e94077ff483cd5eb (diff) | |
| download | linux-stable-6544b95bd789bf79dd0e87a8ccb0eb0ce79431a7.tar.gz linux-stable-6544b95bd789bf79dd0e87a8ccb0eb0ce79431a7.tar.bz2 linux-stable-6544b95bd789bf79dd0e87a8ccb0eb0ce79431a7.zip | |
ASoC: SOF: core: fix error return code in sof_probe_continue()
[ Upstream commit 7d8785bc7adbb4dc5ba8ee06994107637848ded8 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sof/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 12aec140819a..2a6b84d2781e 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -372,6 +372,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; } |