Skip to content

Commit

Permalink
ALSA: hda - Fix beep_mode option value
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Nov 16, 2009
1 parent d5191e5 commit 9bb1fe3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion sound/pci/hda/hda_beep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/hda/hda_beep.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 9bb1fe3

Please sign in to comment.