adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

sound: do not set DEVNAME for OSS devices

Browse source 
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Kay Sievers 2009-07-03 20:56:05 +02:00 committed by Takashi Iwai
parent 7a9d56f6a4
commit 954a973cab
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/sound_core.c
View file

@ -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");
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);
#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