Skip to content

Commit

Permalink
ALSA: snd-usb: re-order code
Browse files Browse the repository at this point in the history
Move code from endpoint.c into a new file called stream.c and rename
functions so that their names actually reflect what they're doing.

This way, endpoint.c will be available to functions that hold all the
endpoint logic.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Sep 14, 2011
1 parent 358e2bd commit e8e8bab
Show file tree
Hide file tree
Showing 7 changed files with 472 additions and 444 deletions.
1 change: 1 addition & 0 deletions sound/usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sound/usb/card.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit e8e8bab

Please sign in to comment.