diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 9c8ac157791f..ff12de474d2c 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)); |