]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ASoC: Intel: skl_hda_dsp_generic: Fix NULLptr dereference in autosuspend delay
authorMateusz Gorski <mateusz.gorski@linux.intel.com>
Wed, 22 Jul 2020 17:35:24 +0000 (19:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Sep 2020 10:59:53 +0000 (12:59 +0200)
commit4c2cd38656631c7f1a160bf8361e89bcbde17c3a
tree03635892536e92ccf29b3ee22f064a5e3e682854
parentfa678750d166a4bc9ccece80e544936e5873026b
ASoC: Intel: skl_hda_dsp_generic: Fix NULLptr dereference in autosuspend delay

[ Upstream commit 5610921a4435ef45c33702073e64f835f3dca7f1 ]

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: 5bf73b1b1dec ("ASoC: intel/skl/hda - fix oops on systems without i915 audio codec")
Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200722173524.30161-1-mateusz.gorski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/intel/boards/skl_hda_dsp_generic.c