summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-06-21 15:49:33 +0200
committerTakashi Iwai <tiwai@suse.de>2012-06-21 15:52:57 +0200
commit8e5a050901a16a62a7d2d4d4ef285eec8ae7203e (patch)
treed8e9954abb6eb12c18086251dd99a5c4503e7445
parentb64a1ba9d3111a7b3eb3bef96efb84dde15e6eac (diff)
downloadop-kernel-dev-8e5a050901a16a62a7d2d4d4ef285eec8ae7203e.zip
op-kernel-dev-8e5a050901a16a62a7d2d4d4ef285eec8ae7203e.tar.gz
ALSA: hda - Fix ALC272X codec detection
The codec ALC272X is a special codec for some Dell machines, and its detection got broken in the recent kernel because SSID check (required by ALC272X check) was moved to the later point. Now we need to move this codec check to the right place, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f8f4906..41475ae 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6705,6 +6705,12 @@ static int patch_alc662(struct hda_codec *codec)
alc_fix_pll_init(codec, 0x20, 0x04, 15);
+ alc_pick_fixup(codec, alc662_fixup_models,
+ alc662_fixup_tbl, alc662_fixups);
+ alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+
+ alc_auto_parse_customize_define(codec);
+
if ((alc_get_coef0(codec) & (1 << 14)) &&
codec->bus->pci->subsystem_vendor == 0x1025 &&
spec->cdefine.platform_type == 1) {
@@ -6712,12 +6718,6 @@ static int patch_alc662(struct hda_codec *codec)
goto error;
}
- alc_pick_fixup(codec, alc662_fixup_models,
- alc662_fixup_tbl, alc662_fixups);
- alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
-
- alc_auto_parse_customize_define(codec);
-
/* automatic parse from the BIOS config */
err = alc662_parse_auto_config(codec);
if (err < 0)
OpenPOWER on IntegriCloud