summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-14 17:32:17 +0100
committerTakashi Iwai <tiwai@suse.de>2011-11-14 17:32:17 +0100
commitb25396994b90f69c5fc6d7cd448174d7eea69f14 (patch)
treecf01c58345a88737db57b5b1f6d23234caaf7199 /sound
parent3ccbf1c3763510d5c443133f9aa40d8bf4ae8db9 (diff)
downloadop-kernel-dev-b25396994b90f69c5fc6d7cd448174d7eea69f14.zip
op-kernel-dev-b25396994b90f69c5fc6d7cd448174d7eea69f14.tar.gz
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 6f0f2f6..41590e3 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) {
OpenPOWER on IntegriCloud