diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /sound/pci/hda/hda_codec.c | |
parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) | |
download | linux-15e7f8b92aed71819411025279cd3df37f8c636b.tar.xz |
Merge branch 'fix/hda' into topic/hda
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 29c90d748c91..b3554df740ff 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1088,11 +1088,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); @@ -1111,6 +1106,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); |