From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 14 Nov 2011 16:32:17 +0000 (+0100)
Subject: ALSA: hda/realtek - Re-add the model string selection for ALC88x
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b25396994b90f69c5fc6d7cd448174d7eea69f14;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

ALSA: hda/realtek - Re-add the model string selection for ALC88x

In the commit [c3e837bb: ALSA: hda/realtek - Rewrite ALC882 acer-aspire-*
models with the auto-parser], the check of the model option got removed
mistakenly.  Re-added the board_config check again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 6f0f2f6b2e46..41590e3a20f5 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4534,7 +4534,10 @@ static int patch_alc882(struct hda_codec *codec)
 	if (err < 0)
 		goto error;
 
-	board_config = alc_board_codec_sid_config(codec,
+	board_config = alc_board_config(codec, ALC882_MODEL_LAST,
+					alc882_models, NULL);
+	if (board_config < 0)
+		board_config = alc_board_codec_sid_config(codec,
 			ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl);
 
 	if (board_config < 0) {