sound: do not set DEVNAME for OSS devices
authorKay Sievers <kay.sievers@suse.de>
Fri, 3 Jul 2009 18:56:05 +0000 (20:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 3 Jul 2009 21:36:13 +0000 (23:36 +0200)
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/sound_core.c

index 12522e6913d92d068676f4b3916571b03dae2d87..a41f8b127f49cceb1432183c4943482d6f61997f 100644 (file)
@@ -10,6 +10,8 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
 #include <sound/core.h>
 
 #ifdef CONFIG_SOUND_OSS_CORE
@@ -29,6 +31,8 @@ MODULE_LICENSE("GPL");
 
 static char *sound_nodename(struct device *dev)
 {
+       if (MAJOR(dev->devt) == SOUND_MAJOR)
+               return NULL;
        return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
 }
 
@@ -104,7 +108,6 @@ module_exit(cleanup_soundcore);
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sound.h>
-#include <linux/major.h>
 #include <linux/kmod.h>
 
 #define SOUND_STEP 16