aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
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));