diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2020-12-11 13:06:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-23 15:48:43 +0100 |
| commit | 3b972cda608f5fd3db77e05f3a1287cdcd7d8b21 (patch) | |
| tree | 0945fd213217535897fe8cf7130381300e75e065 /sound/soc | |
| parent | 2f121a8d64753b3a2d51a97e9c345668feff76f8 (diff) | |
| download | linux-stable-3b972cda608f5fd3db77e05f3a1287cdcd7d8b21.tar.gz linux-stable-3b972cda608f5fd3db77e05f3a1287cdcd7d8b21.tar.bz2 linux-stable-3b972cda608f5fd3db77e05f3a1287cdcd7d8b21.zip | |
ASoC: Intel: fix error code cnl_set_dsp_D0()
commit f373a811fd9a69fc8bafb9bcb41d2cfa36c62665 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/intel/skylake/cnl-sst.c | 1 |
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 387de388ce29..6a5080361887 100644 --- a/sound/soc/intel/skylake/cnl-sst.c +++ b/sound/soc/intel/skylake/cnl-sst.c @@ -212,6 +212,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 { |