Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed320365 authored by Gabriele Mazzotta's avatar Gabriele Mazzotta Committed by Greg Kroah-Hartman
Browse files

ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE 




[ Upstream commit 972aa2c708703c21f14eb958b37e82aae2530e44 ]

Setting shutup when the action is HDA_FIXUP_ACT_PRE_PROBE might
not have the desired effect since it could be overridden by
another more generic shutup function. Prevent this by setting
the more specific shutup function on HDA_FIXUP_ACT_PROBE.

Signed-off-by: default avatarGabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d67ddde8

sound/pci/hda/patch_realtek.c

+1 −1
Original line number Diff line number Diff line
@@ -4289,7 +4289,7 @@ static void alc_no_shutup(struct hda_codec *codec) 
static void alc_fixup_no_shutup(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

	if (action == HDA_FIXUP_ACT_PROBE) {

		struct alc_spec *spec = codec->spec;

		spec->shutup = alc_no_shutup;

	}