diff options
| author | Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2020-07-14 16:28:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-22 13:34:24 +0100 |
| commit | ffc6d45d96f07a32700cb6b7be2d3459e63c255a (patch) | |
| tree | 7fa508eda81e0948e772820cde8b6631099463f8 /sound/soc/intel/boards/skl_hda_dsp_common.h | |
| parent | 04a646ff5acaa9a0a6634af1c94e0d5c8115e5db (diff) | |
| download | linux-ffc6d45d96f07a32700cb6b7be2d3459e63c255a.tar.bz2 | |
ASoC: intel/skl/hda - fix probe regression on systems without i915
Starting in commit cbc7a6b5a87a ("ASoC: soc-card: add
snd_soc_card_add_dai_link()"), error value from ASoc add_dai_link() is
no longer ignored.
The generic HDA machine driver relied on the old semantics to disable
i915 HDMI/DP audio codec at runtime. If no display codec was present,
add_dai_link() returned an error, but this was ignored and rest of the
card was successfully probed.
Fix the problem by changing the machine driver add_dai_link() to not
return an error in this case.
Fixes: cbc7a6b5a87a ("ASoC: soc-card: add snd_soc_card_add_dai_link()")
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
BugLink: https://github.com/thesofproject/linux/issues/2261
Link: https://lore.kernel.org/r/20200714132804.3638221-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/skl_hda_dsp_common.h')
| -rw-r--r-- | sound/soc/intel/boards/skl_hda_dsp_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.h b/sound/soc/intel/boards/skl_hda_dsp_common.h index 507750ef67f3..4b0b3959182e 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.h +++ b/sound/soc/intel/boards/skl_hda_dsp_common.h @@ -33,6 +33,7 @@ struct skl_hda_private { int dai_index; const char *platform_name; bool common_hdmi_codec_drv; + bool idisp_codec; }; extern struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS]; |