mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
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>
This commit is contained in:
parent
7a9d56f6a4
commit
954a973cab
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user