]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: intel/skl/hda - fix probe regression on systems without i915
authorKai Vehmanen <kai.vehmanen@linux.intel.com>
Tue, 14 Jul 2020 13:28:04 +0000 (16:28 +0300)
committerMark Brown <broonie@kernel.org>
Wed, 22 Jul 2020 12:34:24 +0000 (13:34 +0100)
commit16d35ded6945d9d0e8091fb406344bdbe14893f7
tree7fa508eda81e0948e772820cde8b6631099463f8
parent8b55b2a82f6d5208d29d1404622678c5db885560
ASoC: intel/skl/hda - fix probe regression on systems without i915

Starting in commit be36343cbe48 ("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: be36343cbe48 ("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>
sound/soc/intel/boards/skl_hda_dsp_common.h
sound/soc/intel/boards/skl_hda_dsp_generic.c