---

yaml --- r: 353499 b: refs/heads/master c: e6e0ee5 h: refs/heads/master i: 353497: f786a9a 353495: 6edd402 v: v3
git-mirror · Feb 18, 2013 · e5a1632 · e5a1632
1 parent 36f9a6b
commit e5a1632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d06ac14399a0af7e4da0c67cff30d30d7e02df46
+refs/heads/master: e6e0ee507f630350d883bb3343e78cab30cad5e2
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -1516,8 +1516,14 @@ static void alc260_fixup_fsc_s7020(struct hda_codec *codec,
 {
 	struct alc_spec *spec = codec->spec;
 
-	if (action == HDA_FIXUP_ACT_PRE_PROBE)
+	switch (action) {
+	case HDA_FIXUP_ACT_PRE_PROBE:
 		spec->gen.add_out_jack_modes = 1;
+		break;
+	case HDA_FIXUP_ACT_PROBE:
+		spec->init_amp = ALC_INIT_NONE;
+		break;
+	}
 }
 
 static const struct hda_fixup alc260_fixups[] = {