From: Takashi Iwai Date: Mon, 26 Feb 2007 14:56:46 +0000 (+0100) Subject: [ALSA] hda-codec - Allow model=generic always for generic parser X-Git-Tag: v3.12-rc1~29570^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d7b1d7d09e00034325b09a3a7ac7b0ea5e29506;p=kernel%2Fkernel-generic.git [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 Signed-off-by: Jaroslav Kysela --- diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/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_addr, 0); } - 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, sizeof(bus->card->mixername));