summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAlastair Bridgewater <alastair.bridgewater@gmail.com>2018-06-15 21:56:17 -0400
committerTakashi Iwai <tiwai@suse.de>2018-06-17 08:44:26 +0200
commit365c7f25cd0a72b16979ba948e6c389a9a89818b (patch)
tree134faad189366ce5b5391edfa0cb6888f820af4b /sound
parenta3d90d6775e2066a100b9124e40880bd317d2e02 (diff)
downloadlinux-stable-365c7f25cd0a72b16979ba948e6c389a9a89818b.tar.gz
linux-stable-365c7f25cd0a72b16979ba948e6c389a9a89818b.tar.bz2
linux-stable-365c7f25cd0a72b16979ba948e6c389a9a89818b.zip
ALSA: hda/ca0132: Restore behavior of QUIRK_ALIENWARE
Commit e93ac30a32a6ba7ac3b4b2a4379af1dadb91e505 (ALSA: HDA/ca0132: add extra init functions for r3di + sbz) introduced an extra initialization function that was improperly guarded, taking effect on systems with QUIRK_ALIENWARE, even though such systems were supposedly not affected. It may be that this piece of initialization should be done for all systems, but that's not a call that I can make. Fixes: e93ac30a32a6 ("ALSA: HDA/ca0132: add extra init functions for r3di + sbz") Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_ca0132.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index dba731c0bf53..25fccce1eff1 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -7223,7 +7223,7 @@ static int ca0132_init(struct hda_codec *codec)
snd_hda_sequence_write(codec, spec->base_init_verbs);
- if (spec->quirk != QUIRK_NONE)
+ if (spec->use_alt_functions)
ca0132_alt_init(codec);
ca0132_download_dsp(codec);