From fccd76d49b7a14e0ea4ddcd248af3e5236456670 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Feb 2012 18:41:02 +0100
Subject: [PATCH] --- yaml --- r: 293096 b: refs/heads/master c:
 9155f82a6a26da4a5b8d2d29f1d31836906b4712 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e482348de19b..8ad4160546e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67b6ec3196da235317ff1b9474f17379b78f3294
+refs/heads/master: 9155f82a6a26da4a5b8d2d29f1d31836906b4712
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
index 4ac1e3830af4..3c6f5b5161f0 100644
--- a/trunk/sound/pci/hda/patch_realtek.c
+++ b/trunk/sound/pci/hda/patch_realtek.c
@@ -1556,6 +1556,13 @@ static void alc_pick_fixup(struct hda_codec *codec,
 	int id = -1;
 	const char *name = NULL;
 
+	/* when model=nofixup is given, don't pick up any fixups */
+	if (codec->modelname && !strcmp(codec->modelname, "nofixup")) {
+		spec->fixup_list = NULL;
+		spec->fixup_id = -1;
+		return;
+	}
+
 	if (codec->modelname && models) {
 		while (models->name) {
 			if (!strcmp(codec->modelname, models->name)) {