Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'fix/soundcore' into for-linus
* fix/soundcore:
sound: do not set DEVNAME for OSS devices
+4
-1
sound/sound_core.c
+4
-1
sound/sound_core.c
···
10
#include <linux/module.h>
11
#include <linux/device.h>
12
#include <linux/err.h>
13
#include <sound/core.h>
14
15
#ifdef CONFIG_SOUND_OSS_CORE
···
31
32
static char *sound_nodename(struct device *dev)
33
{
34
return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
35
}
36
···
108
#include <linux/types.h>
109
#include <linux/kernel.h>
110
#include <linux/sound.h>
111
-
#include <linux/major.h>
112
#include <linux/kmod.h>
113
114
#define SOUND_STEP 16
···
10
#include <linux/module.h>
11
#include <linux/device.h>
12
#include <linux/err.h>
13
+
#include <linux/kdev_t.h>
14
+
#include <linux/major.h>
15
#include <sound/core.h>
16
17
#ifdef CONFIG_SOUND_OSS_CORE
···
29
30
static char *sound_nodename(struct device *dev)
31
{
32
+
if (MAJOR(dev->devt) == SOUND_MAJOR)
33
+
return NULL;
34
return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
35
}
36
···
104
#include <linux/types.h>
105
#include <linux/kernel.h>
106
#include <linux/sound.h>
107
#include <linux/kmod.h>
108
109
#define SOUND_STEP 16