aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-02-26 09:56:46 -0500
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:55:44 -0400
commit6d7b1d7d09e00034325b09a3a7ac7b0ea5e29506 (patch)
tree18e851d96f2ef3875e9b972839ce6b57559aaf9b /sound/pci/hda/hda_codec.c
parent8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 (diff)
[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 <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 8f34fb447983..4c0a6a5b20d9 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,
573 0); 573 0);
574 } 574 }
575 575
576 codec->preset = find_codec_preset(codec); 576 if (strcmp(codec->bus->modelname, "generic"))
577 codec->preset = find_codec_preset(codec);
577 if (! *bus->card->mixername) 578 if (! *bus->card->mixername)
578 snd_hda_get_codec_name(codec, bus->card->mixername, 579 snd_hda_get_codec_name(codec, bus->card->mixername,
579 sizeof(bus->card->mixername)); 580 sizeof(bus->card->mixername));