1 files changed, 4 insertions, 20 deletions

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 5fc93d00572a..e5d37bd7c226 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -334,9 +334,6 @@ EXPORT_SYMBOL(snd_unregister_device);
 /*
  *  INFO PART
  */
-
-static struct snd_info_entry *snd_minor_info_entry;
-
 static const char *snd_device_type_name(int type)
 {
         switch (type) {
@@ -389,21 +386,10 @@ int __init snd_minor_info_init(void)
         struct snd_info_entry *entry;
 
         entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL);
-        if (entry) {
-                entry->c.text.read = snd_minor_info_read;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        entry = NULL;
-                }
-        }
-        snd_minor_info_entry = entry;
-        return 0;
-}
-
-int __exit snd_minor_info_done(void)
-{
-        snd_info_free_entry(snd_minor_info_entry);
-        return 0;
+        if (!entry)
+                return -ENOMEM;
+        entry->c.text.read = snd_minor_info_read;
+        return snd_info_register(entry); /* freed in error path */
 }
 #endif /* CONFIG_PROC_FS */
 
@@ -423,7 +409,6 @@ static int __init alsa_sound_init(void)
                 unregister_chrdev(major, "alsa");
                 return -ENOMEM;
         }
-        snd_info_minor_register();
 #ifndef MODULE
         pr_info("Advanced Linux Sound Architecture Driver Initialized.\n");
 #endif
@@ -432,7 +417,6 @@ static int __init alsa_sound_init(void)
 
 static void __exit alsa_sound_exit(void)
 {
-        snd_info_minor_unregister();
         snd_info_done();
         unregister_chrdev(major, "alsa");
 }