]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ALSA: hda/ca0132: Restore behavior of QUIRK_ALIENWARE
authorAlastair Bridgewater <alastair.bridgewater@gmail.com>
Sat, 16 Jun 2018 01:56:17 +0000 (21:56 -0400)
committerTakashi Iwai <tiwai@suse.de>
Sun, 17 Jun 2018 06:44:26 +0000 (08:44 +0200)
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>
sound/pci/hda/patch_ca0132.c

index dba731c0bf538cc4d5de25744c31b2286e79a5ef..25fccce1eff14603e20281c72cec8dbd7c6db45f 100644 (file)
@@ -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);