提交 954a973c 编写于 作者: K Kay Sievers 提交者: Takashi Iwai

sound: do not set DEVNAME for OSS devices

Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 7a9d56f6
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/kdev_t.h>
#include <linux/major.h>
#include <sound/core.h> #include <sound/core.h>
#ifdef CONFIG_SOUND_OSS_CORE #ifdef CONFIG_SOUND_OSS_CORE
...@@ -29,6 +31,8 @@ MODULE_LICENSE("GPL"); ...@@ -29,6 +31,8 @@ MODULE_LICENSE("GPL");
static char *sound_nodename(struct device *dev) static char *sound_nodename(struct device *dev)
{ {
if (MAJOR(dev->devt) == SOUND_MAJOR)
return NULL;
return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev)); return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
} }
...@@ -104,7 +108,6 @@ module_exit(cleanup_soundcore); ...@@ -104,7 +108,6 @@ module_exit(cleanup_soundcore);
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sound.h> #include <linux/sound.h>
#include <linux/major.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#define SOUND_STEP 16 #define SOUND_STEP 16
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册