Merge branch 'fix/hda' into topic/hda

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);