Commit 5610921a authored by Mateusz Gorski's avatar Mateusz Gorski Committed by Mark Brown

ASoC: Intel: skl_hda_dsp_generic: Fix NULLptr dereference in autosuspend delay

Different modules for HDMI codec are used depending on the
"hda_codec_use_common_hdmi" option being enabled or not. Driver private
context for both of them is different.
This leads to null-pointer dereference error when driver tries to set
autosuspend delay for HDMI codec while the option is off (hdac_hdmi
module is used for HDMI).

Change the string in conditional statement to "ehdaudio0D0" to ensure
that only the HDAudio codec is handled by this function.

Fixes: 5bf73b1b ("ASoC: intel/skl/hda - fix oops on systems without i915 audio codec")
Signed-off-by: default avatarMateusz Gorski <mateusz.gorski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200722173524.30161-1-mateusz.gorski@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 062fa09f
...@@ -181,7 +181,7 @@ static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card) ...@@ -181,7 +181,7 @@ static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card)
struct snd_soc_dai *dai; struct snd_soc_dai *dai;
for_each_card_rtds(card, rtd) { for_each_card_rtds(card, rtd) {
if (!strstr(rtd->dai_link->codecs->name, "ehdaudio")) if (!strstr(rtd->dai_link->codecs->name, "ehdaudio0D0"))
continue; continue;
dai = asoc_rtd_to_codec(rtd, 0); dai = asoc_rtd_to_codec(rtd, 0);
hda_pvt = snd_soc_component_get_drvdata(dai->component); hda_pvt = snd_soc_component_get_drvdata(dai->component);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment