diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2009-07-03 20:56:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-03 23:36:13 +0200 |
| commit | 954a973cab37ad5df3f87f08964166abd956cc17 (patch) | |
| tree | 87617bbaaf84bbb25f5c2ab331b7841fc65625d8 /sound/sound_core.c | |
| parent | 7a9d56f6a459472bc4383aeb85612d72e79d1818 (diff) | |
| download | linux-stable-954a973cab37ad5df3f87f08964166abd956cc17.tar.gz linux-stable-954a973cab37ad5df3f87f08964166abd956cc17.tar.bz2 linux-stable-954a973cab37ad5df3f87f08964166abd956cc17.zip | |
sound: do not set DEVNAME for OSS devices
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sound_core.c')
| -rw-r--r-- | sound/sound_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c index 12522e6913d9..a41f8b127f49 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -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 |