From: Takashi Iwai Date: Mon, 19 Nov 2018 11:19:21 +0000 (+0100) Subject: Merge branch 'for-linus' into for-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=988e30af9a508a40d958a9eec5c47b1c6d36176f;p=linux.git Merge branch 'for-linus' into for-next Backporting for further works on ca0132 codec driver Signed-off-by: Takashi Iwai --- 988e30af9a508a40d958a9eec5c47b1c6d36176f diff --cc sound/pci/hda/patch_ca0132.c index 9c0b94ba786ec,0a567634e5fad..c40cb63360174 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@@ -8526,13 -8489,11 +8527,13 @@@ static void ca0132_config(struct hda_co break; case QUIRK_AE5: codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__); - snd_hda_apply_pincfgs(codec, r3di_pincfgs); + snd_hda_apply_pincfgs(codec, ae5_pincfgs); break; + default: + break; } - switch (spec->quirk) { + switch (ca0132_quirk(spec)) { case QUIRK_ALIENWARE: spec->num_outputs = 2; spec->out_pins[0] = 0x0b; /* speaker out */