commit 84957a8ab086377a025e0448fa716ed5983f3c3a
author Clemens Ladisch <clemens@ladisch.de> Fri Apr 29 16:23:13 2005 +0200
committer Jaroslav Kysela <perex@suse.cz> Sun May 29 10:05:37 2005 +0200
tree 7d405711f0fd2e6eb8c305b7bddf0aaeac22f3e4
parent 707e60732fc25fe3760f916d083b262a86a666c0

[ALSA] usb-audio - move mixer data into separate struct

USB generic driver
Move all data related to audio control interfaces into a separate struct
local to usbmixer.c.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

sound/usb/usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index e4b9104..eeb09bb 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3091,6 +3091,7 @@
 	chip->card = card;
 	INIT_LIST_HEAD(&chip->pcm_list);
 	INIT_LIST_HEAD(&chip->midi_list);
+	INIT_LIST_HEAD(&chip->mixer_list);
 
 	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
 		snd_usb_audio_free(chip);
@@ -3290,6 +3291,10 @@
 		list_for_each(p, &chip->midi_list) {
 			snd_usbmidi_disconnect(p);
 		}
+		/* release mixer resources */
+		list_for_each(p, &chip->mixer_list) {
+			snd_usb_mixer_disconnect(p);
+		}
 		usb_chip[chip->index] = NULL;
 		up(&register_mutex);
 		snd_card_free(card);