lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] Revert the nested-device patch

Browse Source 
Modules: ALSA Core

Revert the nested-device patch to keep the compatibility with the
current HAL configuration.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2006-01-03 19:54:44 +01:00
committed by Jaroslav Kysela
parent 2ad5dd8dc3
commit 3e23c65883
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/core/sound.c
View File

@@ -245,7 +245,6 @@ int snd_register_device(int type, struct snd_card *card, int dev,
int minor;
struct snd_minor *preg;
struct device *device = NULL;
struct class_device *class_device = NULL;
snd_assert(name, return -EINVAL);
preg = kmalloc(sizeof(struct snd_minor) + strlen(name) + 1, GFP_KERNEL);
@@ -273,15 +272,9 @@ int snd_register_device(int type, struct snd_card *card, int dev,
snd_minors[minor] = preg;
if (type != SNDRV_DEVICE_TYPE_CONTROL || preg->card >= cards_limit)
devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s", name);
if (card) {
if (card)
device = card->dev;
class_device = card->parent_device;
}
class_device = class_device_create(sound_class, class_device,
MKDEV(major, minor), device,
"%s", name);
if (type == SNDRV_DEVICE_TYPE_CONTROL)
card->parent_device = class_device;
class_device_create(sound_class, NULL, MKDEV(major, minor), device, "%s", name);
up(&sound_mutex);
return 0;