diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-13 17:11:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:13:57 +0200 |
| commit | 33e91a59bf8142a1459a9d9ec3e9a4353efd362e (patch) | |
| tree | 3b18f32b7c01fe39c74c82879769af66dd46e104 | |
| parent | 5397eb1a1fb04e5065491419c6a27cf89ae05120 (diff) | |
| download | linux-stable-33e91a59bf8142a1459a9d9ec3e9a4353efd362e.tar.gz linux-stable-33e91a59bf8142a1459a9d9ec3e9a4353efd362e.tar.bz2 linux-stable-33e91a59bf8142a1459a9d9ec3e9a4353efd362e.zip | |
ALSA: hda - Drop unsol event handler for Intel HDMI codecs
[ Upstream commit f2dbe87c5ac1f88e6007ba1f1374f4bd8a197fb6 ]
We don't need to deal with the unsol events for Intel chips that are
tied with the graphics via audio component notifier. Although the
presence of the audio component is checked at the beginning of
hdmi_unsol_event(), better to short cut by dropping unsol_event ops.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204565
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index e49c1c00f5ce..ca0404edd939 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2611,6 +2611,8 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec, /* precondition and allocation for Intel codecs */ static int alloc_intel_hdmi(struct hda_codec *codec) { + int err; + /* requires i915 binding */ if (!codec->bus->core.audio_component) { codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n"); @@ -2619,7 +2621,12 @@ static int alloc_intel_hdmi(struct hda_codec *codec) return -ENODEV; } - return alloc_generic_hdmi(codec); + err = alloc_generic_hdmi(codec); + if (err < 0) + return err; + /* no need to handle unsol events */ + codec->patch_ops.unsol_event = NULL; + return 0; } /* parse and post-process for Intel codecs */ |