Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ce1695c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/soundcore' into for-linus 

* fix/soundcore:
  sound: do not set DEVNAME for OSS devices
parents 854ace9c 954a973c

sound/sound_core.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -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