Commit:     6d7b1d7d09e00034325b09a3a7ac7b0ea5e29506
Parent:     8ad2da1937168d48a84dcf6d5cc2001c0e4a6992
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 26 15:56:46 2007 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Fri May 11 16:55:44 2007 +0200

    [ALSA] hda-codec - Allow model=generic always for generic parser
    Accept model=generic option to specify the generic parser regardless
    of codec chips.  This is helpful for testing and debugging.
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
 Documentation/sound/alsa/ALSA-Configuration.txt |    4 ++++
 sound/pci/hda/hda_codec.c                       |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt 
index 24ea129..4d92a3e 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -924,6 +924,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. 
This was removed.
          vaio          Setup for VAIO FE550G/SZ110
          vaio-ar Setup for VAIO AR
+    The model name "genric" is treated as a special case.  When this
+    model is given, the driver uses the generic codec parser without
+    "codec-patch".  It's sometimes good for testing and debugging.
     If the default configuration doesn't work and one of the above
     matches with your device, report it together with the PCI
     subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 8f34fb4..4c0a6a5 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -573,7 +573,8 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int 
-       codec->preset = find_codec_preset(codec);
+       if (strcmp(codec->bus->modelname, "generic"))
+               codec->preset = find_codec_preset(codec);
        if (! *bus->card->mixername)
                snd_hda_get_codec_name(codec, 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

Reply via email to