]>
Commit | Line | Data |
---|---|---|
18a2513c GKH |
1 | From foo@baz Tue Nov 28 10:56:34 CET 2017 |
2 | From: Gabriele Mazzotta <gabriele.mzt@gmail.com> | |
3 | Date: Sat, 24 Dec 2016 19:50:00 +0100 | |
4 | Subject: ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE | |
5 | ||
6 | From: Gabriele Mazzotta <gabriele.mzt@gmail.com> | |
7 | ||
8 | ||
9 | [ Upstream commit 972aa2c708703c21f14eb958b37e82aae2530e44 ] | |
10 | ||
11 | Setting shutup when the action is HDA_FIXUP_ACT_PRE_PROBE might | |
12 | not have the desired effect since it could be overridden by | |
13 | another more generic shutup function. Prevent this by setting | |
14 | the more specific shutup function on HDA_FIXUP_ACT_PROBE. | |
15 | ||
16 | Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com> | |
17 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
18 | Signed-off-by: Sasha Levin <alexander.levin@verizon.com> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
20 | --- | |
21 | sound/pci/hda/patch_realtek.c | 2 +- | |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
23 | ||
24 | --- a/sound/pci/hda/patch_realtek.c | |
25 | +++ b/sound/pci/hda/patch_realtek.c | |
26 | @@ -4404,7 +4404,7 @@ static void alc_no_shutup(struct hda_cod | |
27 | static void alc_fixup_no_shutup(struct hda_codec *codec, | |
28 | const struct hda_fixup *fix, int action) | |
29 | { | |
30 | - if (action == HDA_FIXUP_ACT_PRE_PROBE) { | |
31 | + if (action == HDA_FIXUP_ACT_PROBE) { | |
32 | struct alc_spec *spec = codec->spec; | |
33 | spec->shutup = alc_no_shutup; | |
34 | } |