summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorGabriele Mazzotta <gabriele.mzt@gmail.com>2016-12-24 19:50:00 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-30 08:37:26 +0000
commit31447ebb1a863b611676e2787db7160e19bd7e3c (patch)
tree91c4c02dfbd8dcb874a4695b5b0247771aefd118 /sound
parent7e920566c352c9434010cbaf6a5ccd82c3ce73cf (diff)
downloadlinux-stable-31447ebb1a863b611676e2787db7160e19bd7e3c.tar.gz
linux-stable-31447ebb1a863b611676e2787db7160e19bd7e3c.tar.bz2
linux-stable-31447ebb1a863b611676e2787db7160e19bd7e3c.zip
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: Gabriele Mazzotta <gabriele.mzt@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 64085a512dbf..e5730a7d0480 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4404,7 +4404,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;
}