aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r--sound/pci/hda/patch_conexant.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index f8f0dfbef149..f788a91b544a 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -850,6 +850,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
850 return -ENOMEM; 850 return -ENOMEM;
851 snd_hda_gen_spec_init(&spec->gen); 851 snd_hda_gen_spec_init(&spec->gen);
852 codec->spec = spec; 852 codec->spec = spec;
853 codec->patch_ops = cx_auto_patch_ops;
853 854
854 cx_auto_parse_beep(codec); 855 cx_auto_parse_beep(codec);
855 cx_auto_parse_eapd(codec); 856 cx_auto_parse_eapd(codec);
@@ -908,8 +909,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
908 if (err < 0) 909 if (err < 0)
909 goto error; 910 goto error;
910 911
911 codec->patch_ops = cx_auto_patch_ops;
912
913 /* Some laptops with Conexant chips show stalls in S3 resume, 912 /* Some laptops with Conexant chips show stalls in S3 resume,
914 * which falls into the single-cmd mode. 913 * which falls into the single-cmd mode.
915 * Better to make reset, then. 914 * Better to make reset, then.
@@ -968,6 +967,14 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = {
968 .patch = patch_conexant_auto }, 967 .patch = patch_conexant_auto },
969 { .id = 0x14f150b9, .name = "CX20665", 968 { .id = 0x14f150b9, .name = "CX20665",
970 .patch = patch_conexant_auto }, 969 .patch = patch_conexant_auto },
970 { .id = 0x14f150f1, .name = "CX20721",
971 .patch = patch_conexant_auto },
972 { .id = 0x14f150f2, .name = "CX20722",
973 .patch = patch_conexant_auto },
974 { .id = 0x14f150f3, .name = "CX20723",
975 .patch = patch_conexant_auto },
976 { .id = 0x14f150f4, .name = "CX20724",
977 .patch = patch_conexant_auto },
971 { .id = 0x14f1510f, .name = "CX20751/2", 978 { .id = 0x14f1510f, .name = "CX20751/2",
972 .patch = patch_conexant_auto }, 979 .patch = patch_conexant_auto },
973 { .id = 0x14f15110, .name = "CX20751/2", 980 { .id = 0x14f15110, .name = "CX20751/2",
@@ -1002,6 +1009,10 @@ MODULE_ALIAS("snd-hda-codec-id:14f150ab");
1002MODULE_ALIAS("snd-hda-codec-id:14f150ac"); 1009MODULE_ALIAS("snd-hda-codec-id:14f150ac");
1003MODULE_ALIAS("snd-hda-codec-id:14f150b8"); 1010MODULE_ALIAS("snd-hda-codec-id:14f150b8");
1004MODULE_ALIAS("snd-hda-codec-id:14f150b9"); 1011MODULE_ALIAS("snd-hda-codec-id:14f150b9");
1012MODULE_ALIAS("snd-hda-codec-id:14f150f1");
1013MODULE_ALIAS("snd-hda-codec-id:14f150f2");
1014MODULE_ALIAS("snd-hda-codec-id:14f150f3");
1015MODULE_ALIAS("snd-hda-codec-id:14f150f4");
1005MODULE_ALIAS("snd-hda-codec-id:14f1510f"); 1016MODULE_ALIAS("snd-hda-codec-id:14f1510f");
1006MODULE_ALIAS("snd-hda-codec-id:14f15110"); 1017MODULE_ALIAS("snd-hda-codec-id:14f15110");
1007MODULE_ALIAS("snd-hda-codec-id:14f15111"); 1018MODULE_ALIAS("snd-hda-codec-id:14f15111");