Skip to content

Commit

Permalink
sound: do not set DEVNAME for OSS devices
Browse files Browse the repository at this point in the history
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Kay Sievers authored and tiwai committed Jul 3, 2009
1 parent 7a9d56f commit 954a973
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sound/sound_core.c
Expand Up @@ -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
Expand All @@ -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));
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 954a973

Please sign in to comment.