ALSA: hda - Don't create a beep control for digital-only ALC268

Previous thread: ALSA: hda - Fix an "unused variable" compile warning by Linux Kernel Mailing List on Thursday, March 26, 2009 - 12:15 pm. (1 message)

Next thread: ALSA: hda - Remove Toshiba probe_mask quirk by Linux Kernel Mailing List on Thursday, March 26, 2009 - 12:15 pm. (1 message)
From: Linux Kernel Mailing List
Date: Thursday, March 26, 2009 - 12:15 pm

Gitweb:     http://git.kernel.org/linus/892981ffbe9a5c4cbc9d75f423b145f32c765f9c
Commit:     892981ffbe9a5c4cbc9d75f423b145f32c765f9c
Parent:     b31b43e9fb49b71ae753bebc185fe55797ba20c6
Author:     Takashi Iwai <tiwai@suse.de>
AuthorDate: Mon Mar 2 08:04:35 2009 +0100
Committer:  Takashi Iwai <tiwai@suse.de>
CommitDate: Mon Mar 2 08:04:35 2009 +0100

    ALSA: hda - Don't create a beep control for digital-only ALC268
    
    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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 1cc31ac..c60c86a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -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);
--

Previous thread: ALSA: hda - Fix an "unused variable" compile warning by Linux Kernel Mailing List on Thursday, March 26, 2009 - 12:15 pm. (1 message)

Next thread: ALSA: hda - Remove Toshiba probe_mask quirk by Linux Kernel Mailing List on Thursday, March 26, 2009 - 12:15 pm. (1 message)