aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-14 11:32:17 -0500
committerTakashi Iwai <tiwai@suse.de>2011-11-14 11:32:17 -0500
commitb25396994b90f69c5fc6d7cd448174d7eea69f14 (patch)
treecf01c58345a88737db57b5b1f6d23234caaf7199 /sound
parent3ccbf1c3763510d5c443133f9aa40d8bf4ae8db9 (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c5
1 files changed, 4 insertions, 1 deletions
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)
4534 if (err < 0) 4534 if (err < 0)
4535 goto error; 4535 goto error;
4536 4536
4537 board_config = alc_board_codec_sid_config(codec, 4537 board_config = alc_board_config(codec, ALC882_MODEL_LAST,
4538 alc882_models, NULL);
4539 if (board_config < 0)
4540 board_config = alc_board_codec_sid_config(codec,
4538 ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl); 4541 ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl);
4539 4542
4540 if (board_config < 0) { 4543 if (board_config < 0) {