Merge branch 'fix/hda' into topic/hda

diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 300ab407cf42ede5b34eeace7ed9286836b5f118..482fb0304ca91fc4a7735408393ec68b888bcefc 100644 (file)
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -175,7 +175,7 @@ static int reconfig_codec(struct hda_codec *codec)
        err = snd_hda_codec_build_controls(codec);
        if (err < 0)
                return err;
-       return 0;
+       return snd_card_register(codec->bus->card);
 }
 
 /*