Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=43ea1d478fe5eaf4441263cf6ddad7dd05e1a399
Commit:     43ea1d478fe5eaf4441263cf6ddad7dd05e1a399
Parent:     b7dd2b349a9fa9e4347780c2bbb41e51484b5bb5
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 26 19:12:08 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Fri May 11 16:56:12 2007 +0200

    [ALSA] hda-codec - Prefer audio codec name as the mixer name
    
    Prefer the name of audio codecs as the mixer name even if
    modem codecs are probed before the audio codecs.
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/hda_codec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9c8ac15..ff12de4 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -576,7 +576,8 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, 
unsigned int codec_addr,
        }
 
        codec->preset = find_codec_preset(codec);
-       if (!*bus->card->mixername)
+       /* audio codec should override the mixer name */
+       if (codec->afg || !*bus->card->mixername)
                snd_hda_get_codec_name(codec, bus->card->mixername,
                                       sizeof(bus->card->mixername));
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to