ALSA: hda - Fix beep_mode option value

The beep_mode option value was wrongly defined: it must be 0 = off and
1 = on.

Also, evaluate the beep_mode value at snd_hda_attach_beep_device()
properly so that no device is created when beep_mode=0 is given.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 9e48798b415b8d545ca9cec7057e492fa39ec052..5fe34a8d8c816ae6df99d80753a97a8afed1cd3e 100644 (file)
--- 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 17dd1c325e32aeac7c90bbd6664a2fcfbb98b7c4..f1de1bac042c260e5612a2f55f9ff13e79a30406 100644 (file)
--- 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 */