aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-06-21 09:49:33 -0400
committerTakashi Iwai <tiwai@suse.de>2012-06-21 09:52:57 -0400
commit8e5a050901a16a62a7d2d4d4ef285eec8ae7203e (patch)
treed8e9954abb6eb12c18086251dd99a5c4503e7445 /sound
parentb64a1ba9d3111a7b3eb3bef96efb84dde15e6eac (diff)
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>
Diffstat (limited to 'sound')
-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 f8f4906e498d..41475ae0e769 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)
6705 6705
6706 alc_fix_pll_init(codec, 0x20, 0x04, 15); 6706 alc_fix_pll_init(codec, 0x20, 0x04, 15);
6707 6707
6708 alc_pick_fixup(codec, alc662_fixup_models,
6709 alc662_fixup_tbl, alc662_fixups);
6710 alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
6711
6712 alc_auto_parse_customize_define(codec);
6713
6708 if ((alc_get_coef0(codec) & (1 << 14)) && 6714 if ((alc_get_coef0(codec) & (1 << 14)) &&
6709 codec->bus->pci->subsystem_vendor == 0x1025 && 6715 codec->bus->pci->subsystem_vendor == 0x1025 &&
6710 spec->cdefine.platform_type == 1) { 6716 spec->cdefine.platform_type == 1) {
@@ -6712,12 +6718,6 @@ static int patch_alc662(struct hda_codec *codec)
6712 goto error; 6718 goto error;
6713 } 6719 }
6714 6720
6715 alc_pick_fixup(codec, alc662_fixup_models,
6716 alc662_fixup_tbl, alc662_fixups);
6717 alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
6718
6719 alc_auto_parse_customize_define(codec);
6720
6721 /* automatic parse from the BIOS config */ 6721 /* automatic parse from the BIOS config */
6722 err = alc662_parse_auto_config(codec); 6722 err = alc662_parse_auto_config(codec);
6723 if (err < 0) 6723 if (err < 0)