diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:17 +0100 |
commit | 54a26089a2733df2765342acaaf71466d37ff5a5 (patch) | |
tree | 9779d54ac78d3b9fc8d9b5d9e8cc76dc362699fb /sound/pci/hda/hda_codec.c | |
parent | 3095b165a14b1a95eb500bcaf13ad725a27fe825 (diff) | |
parent | 95e70e87533f9d117d369495ee633cb7d18dc802 (diff) |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 9cfdb771928..950ee5cfcac 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1086,11 +1086,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) if (err < 0) return err; } - /* audio codec should override the mixer name */ - if (codec->afg || !*codec->bus->card->mixername) - snprintf(codec->bus->card->mixername, - sizeof(codec->bus->card->mixername), - "%s %s", codec->vendor_name, codec->chip_name); if (is_generic_config(codec)) { err = snd_hda_parse_generic_codec(codec); @@ -1109,6 +1104,11 @@ int snd_hda_codec_configure(struct hda_codec *codec) patched: if (!err && codec->patch_ops.unsol_event) err = init_unsol_queue(codec->bus); + /* audio codec should override the mixer name */ + if (!err && (codec->afg || !*codec->bus->card->mixername)) + snprintf(codec->bus->card->mixername, + sizeof(codec->bus->card->mixername), + "%s %s", codec->vendor_name, codec->chip_name); return err; } EXPORT_SYMBOL_HDA(snd_hda_codec_configure); |