summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-12-11 13:06:52 +0300
committerMark Brown <broonie@kernel.org>2020-12-14 17:29:59 +0000
commitf373a811fd9a69fc8bafb9bcb41d2cfa36c62665 (patch)
tree2260d9670c7b64bc44aac808634f0566999583c2 /sound
parent84de089e770b57280d87dff51be894b6fda18810 (diff)
downloadlinux-stable-f373a811fd9a69fc8bafb9bcb41d2cfa36c62665.tar.gz
linux-stable-f373a811fd9a69fc8bafb9bcb41d2cfa36c62665.tar.bz2
linux-stable-f373a811fd9a69fc8bafb9bcb41d2cfa36c62665.zip
ASoC: Intel: fix error code cnl_set_dsp_D0()
Return -ETIMEDOUT if the dsp boot times out instead of returning success. Fixes: cb6a55284629 ("ASoC: Intel: cnl: Add sst library functions for cnl platform") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/X9NEvCzuN+IObnTN@mwanda Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/cnl-sst.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/cnl-sst.c b/sound/soc/intel/skylake/cnl-sst.c
index fcd8dff27ae8..1275c149acc0 100644
--- a/sound/soc/intel/skylake/cnl-sst.c
+++ b/sound/soc/intel/skylake/cnl-sst.c
@@ -224,6 +224,7 @@ static int cnl_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)
"dsp boot timeout, status=%#x error=%#x\n",
sst_dsp_shim_read(ctx, CNL_ADSP_FW_STATUS),
sst_dsp_shim_read(ctx, CNL_ADSP_ERROR_CODE));
+ ret = -ETIMEDOUT;
goto err;
}
} else {