diff options
| author | Mark Brown | 2020-12-28 12:24:15 +0000 |
|---|---|---|
| committer | Mark Brown | 2020-12-28 12:24:15 +0000 |
| commit | 984fcd3f4e7baa16344e17c6ce5e1e53e38aec36 (patch) | |
| tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /sound/soc/intel | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| parent | 671ee4db952449acde126965bf76817a3159040d (diff) | |
Merge existing fixes from asoc/for-5.11
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/haswell.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/skylake/cnl-sst.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index c55d1239e705..c763bfeb1f38 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -189,6 +189,7 @@ static struct platform_driver haswell_audio = { .probe = haswell_audio_probe, .driver = { .name = "haswell-audio", + .pm = &snd_soc_pm_ops, }, }; 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 { |