diff --git a/[refs] b/[refs]
index 4a4405bf2553..1230f0767851 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5191e50b251594bdde10d4839a952ff1646ef62
+refs/heads/master: 9bb1fe390de3e1def0dd162dbdaf62e0981105fa
diff --git a/trunk/sound/pci/hda/hda_beep.c b/trunk/sound/pci/hda/hda_beep.c
index 9e48798b415b..5fe34a8d8c81 100644
--- a/trunk/sound/pci/hda/hda_beep.c
+++ b/trunk/sound/pci/hda/hda_beep.c
@@ -215,7 +215,9 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 	struct hda_beep *beep;
 
 	if (!snd_hda_get_bool_hint(codec, "beep"))
-		return 0; /* disabled explicitly */
+		return 0; /* disabled explicitly by hints */
+	if (codec->beep_mode == HDA_BEEP_MODE_OFF)
+		return 0; /* disabled by module option */
 
 	beep = kzalloc(sizeof(*beep), GFP_KERNEL);
 	if (beep == NULL)
diff --git a/trunk/sound/pci/hda/hda_beep.h b/trunk/sound/pci/hda/hda_beep.h
index 17dd1c325e32..f1de1bac042c 100644
--- a/trunk/sound/pci/hda/hda_beep.h
+++ b/trunk/sound/pci/hda/hda_beep.h
@@ -24,8 +24,8 @@
 
 #include "hda_codec.h"
 
-#define HDA_BEEP_MODE_ON	0
-#define HDA_BEEP_MODE_OFF	1
+#define HDA_BEEP_MODE_OFF	0
+#define HDA_BEEP_MODE_ON	1
 #define HDA_BEEP_MODE_SWREG	2
 
 /* beep information */