2 files changed, 5 insertions, 3 deletions

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 9e48798b415b..5fe34a8d8c81 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/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/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 17dd1c325e32..f1de1bac042c 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/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 */