These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / core / sound_oss.c

diff --git a/kernel/sound/core/sound_oss.c b/kernel/sound/core/sound_oss.c
index 573a65e..0ca9d72 100644 (file)
--- a/kernel/sound/core/sound_oss.c
+++ b/kernel/sound/core/sound_oss.c
@@ -19,12 +19,6 @@
  *
  */
 
-#ifdef CONFIG_SND_OSSEMUL
-
-#if !IS_ENABLED(CONFIG_SOUND)
-#error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel."
-#endif
-
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/slab.h>
@@ -213,10 +207,7 @@ EXPORT_SYMBOL(snd_unregister_oss_device);
  *  INFO PART
  */
 
-#ifdef CONFIG_PROC_FS
-
-static struct snd_info_entry *snd_minor_info_oss_entry;
-
+#ifdef CONFIG_SND_PROC_FS
 static const char *snd_oss_device_type_name(int type)
 {
        switch (type) {
@@ -263,22 +254,9 @@ int __init snd_minor_info_oss_init(void)
        struct snd_info_entry *entry;
 
        entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
-       if (entry) {
-               entry->c.text.read = snd_minor_info_oss_read;
-               if (snd_info_register(entry) < 0) {
-                       snd_info_free_entry(entry);
-                       entry = NULL;
-               }
-       }
-       snd_minor_info_oss_entry = entry;
-       return 0;
-}
-
-int __exit snd_minor_info_oss_done(void)
-{
-       snd_info_free_entry(snd_minor_info_oss_entry);
-       return 0;
+       if (!entry)
+               return -ENOMEM;
+       entry->c.text.read = snd_minor_info_oss_read;
+       return snd_info_register(entry); /* freed in error path */
 }
-#endif /* CONFIG_PROC_FS */
-
-#endif /* CONFIG_SND_OSSEMUL */
+#endif /* CONFIG_SND_PROC_FS */