---

yaml --- r: 270424 b: refs/heads/master c: e8e8bab h: refs/heads/master v: v3
git-mirror · Sep 14, 2011 · c5e2bcb · c5e2bcb
1 parent 2768738
commit c5e2bcb
Show file tree

Hide file tree

Showing 8 changed files with 473 additions and 445 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 358e2bd4a97780f5522e1666c8188a3a60a0d03c
+refs/heads/master: e8e8babf561c9560f37b9bd80407ebaf90ad2ca4
diff --git a/trunk/sound/usb/Makefile b/trunk/sound/usb/Makefile
@@ -12,6 +12,7 @@ snd-usb-audio-objs := 	card.o \
 			pcm.o \
 			proc.o \
 			quirks.o \
+			stream.o \
 			urb.o
 
 snd-usbmidi-lib-objs := midi.o

diff --git a/trunk/sound/usb/card.c b/trunk/sound/usb/card.c
@@ -68,6 +68,7 @@
 #include "urb.h"
 #include "format.h"
 #include "power.h"
+#include "stream.h"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -185,7 +186,7 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
 		return -EINVAL;
 	}
 
-	if (! snd_usb_parse_audio_endpoints(chip, interface)) {
+	if (! snd_usb_parse_audio_interface(chip, interface)) {
 		usb_set_interface(dev, interface, 0); /* reset the current interface */
 		usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
 		return -EINVAL;