diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-03 23:50:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-03 23:50:47 +0200 |
| commit | 7ce1695c40e765e99cd790f55fc68037bc05d080 (patch) | |
| tree | 307159412ee5c02f00c9c7d9ade45826f1380e72 /sound | |
| parent | 854ace9c40d2b121191e1644aa4b0b68c4a226d3 (diff) | |
| parent | 954a973cab37ad5df3f87f08964166abd956cc17 (diff) | |
| download | linux-7ce1695c40e765e99cd790f55fc68037bc05d080.tar.gz linux-7ce1695c40e765e99cd790f55fc68037bc05d080.tar.bz2 linux-7ce1695c40e765e99cd790f55fc68037bc05d080.zip | |
Merge branch 'fix/soundcore' into for-linus
* fix/soundcore:
sound: do not set DEVNAME for OSS devices
Diffstat (limited to 'sound')
| -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 |