From 3e23c658833f135508127c955d40d7c9387f71dd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 3 Jan 2006 19:54:44 +0100 Subject: [ALSA] Revert the nested-device patch Modules: ALSA Core Revert the nested-device patch to keep the compatibility with the current HAL configuration. Signed-off-by: Takashi Iwai --- sound/core/device.c | 2 +- sound/core/sound.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'sound') diff --git a/sound/core/device.c b/sound/core/device.c index 478264cab67..b1cf6ec5678 100644 --- a/sound/core/device.c +++ b/sound/core/device.c @@ -193,7 +193,7 @@ int snd_device_register_all(struct snd_card *card) int err; snd_assert(card != NULL, return -ENXIO); - list_for_each_prev(list, &card->devices) { + list_for_each(list, &card->devices) { dev = snd_device(list); if (dev->state == SNDRV_DEV_BUILD && dev->ops->dev_register) { if ((err = dev->ops->dev_register(dev)) < 0) diff --git a/sound/core/sound.c b/sound/core/sound.c index 2f6108deb21..a8eda02bcf1 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -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; -- cgit v1.2.3