From e5a1632f509cda1e95c124c3a6dc299302b387b6 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 18 Feb 2013 17:04:20 +0100
Subject: [PATCH] --- yaml --- r: 353499 b: refs/heads/master c:
 e6e0ee507f630350d883bb3343e78cab30cad5e2 h: refs/heads/master i:   353497:
 f786a9a6e6eaa8f4914d2083d59fa6fb95a4267c   353495:
 6edd40217de8b2089e24f5ab8a8cbcd70440c91b v: v3

---
 [refs]                              | 2 +-
 trunk/sound/pci/hda/patch_realtek.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77eb0977b7ea..65e52b566764 100644
--- 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
index e575685cca99..61478fd82565 100644
--- 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[] = {