---

yaml --- r: 353187 b: refs/heads/master c: 164a7ad h: refs/heads/master i: 353185: b209575 353183: a29ffcf v: v3
git-mirror · Jan 18, 2013 · 431bdd3 · 431bdd3
1 parent abef797
commit 431bdd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf799aa300b38f86684944bf9f61f7a13277f8b2
+refs/heads/master: 164a7adac9b4fbd2a4838eff3597d27eb010c787
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
@@ -3197,6 +3197,9 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
 	.init = snd_hda_gen_init,
 	.free = snd_hda_gen_free,
 	.unsol_event = snd_hda_jack_unsol_event,
+#ifdef CONFIG_PM
+	.check_power_status = snd_hda_gen_check_power_status,
+#endif
 };
 
 /*
@@ -3348,6 +3351,10 @@ static int patch_conexant_auto(struct hda_codec *codec)
 	case 0x14f15045:
 		codec->single_adc_amp = 1;
 		break;
+	case 0x14f15047:
+		codec->pin_amp_workaround = 1;
+		spec->gen.mixer_nid = 0x19;
+		break;
 	case 0x14f15051:
 		add_cx5051_fake_mutes(codec);
 		codec->pin_amp_workaround = 1;