]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Don't create a beep control for digital-only ALC268
authorTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:04:35 +0000 (08:04 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:04:35 +0000 (08:04 +0100)
When an ALC268 codec is set up as the digital-only (as found in Toshiba
laptops), it shouldn't contain any beep control that conflict with the
primary codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 1cc31ac035225b5468bb826d1be5679ca423e7ec..c60c86acd9ba9b51a8b6c96730e2bc56109fa5f9 100644 (file)
@@ -11915,7 +11915,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
        if (spec->kctls.list)
                add_mixer(spec, spec->kctls.list);
 
-       if (spec->autocfg.speaker_pins[0] != 0x1d)
+       if (!spec->no_analog && spec->autocfg.speaker_pins[0] != 0x1d)
                add_mixer(spec, alc268_beep_mixer);
 
        add_verb(spec, alc268_volume_init_verbs);