p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: usb-audio: remove implicit_fb from quirk 

Since the quirks all apply to implicit feedback (the source endpoint
is always a data endpoint), there's no need to set and check
a flag for it.

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eldad Zack 2013-08-03 10:51:14 +02:00 committed by Takashi Iwai
parent 914273c714
commit 88abb8eff4
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/usb/pcm.c
View File

@ -334,7 +334,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
{ {
struct usb_host_interface *alts; struct usb_host_interface *alts;
struct usb_interface *iface; struct usb_interface *iface;
int implicit_fb = 0;
unsigned int ep; unsigned int ep;
/* Implicit feedback sync EPs consumers are always playback EPs */ /* Implicit feedback sync EPs consumers are always playback EPs */
@ -344,7 +343,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
switch (subs->stream->chip->usb_id) { switch (subs->stream->chip->usb_id) {
case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */ case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */
implicit_fb = 1;
ep = 0x81; ep = 0x81;
iface = usb_ifnum_to_if(dev, 3); iface = usb_ifnum_to_if(dev, 3);
@ -356,7 +354,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
break; break;
case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */ case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */
case USB_ID(0x0763, 0x2081): case USB_ID(0x0763, 0x2081):
implicit_fb = 1;
ep = 0x81; ep = 0x81;
iface = usb_ifnum_to_if(dev, 2); iface = usb_ifnum_to_if(dev, 2);
@ -374,7 +371,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
search_roland_implicit_fb(dev, altsd->bInterfaceNumber + 1, search_roland_implicit_fb(dev, altsd->bInterfaceNumber + 1,
altsd->bAlternateSetting, altsd->bAlternateSetting,
&alts, &ep) >= 0) { &alts, &ep) >= 0) {
implicit_fb = 1;
goto add_sync_ep; goto add_sync_ep;
} }
@ -384,9 +380,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
add_sync_ep: add_sync_ep:
subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip, subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip,
alts, ep, !subs->direction, alts, ep, !subs->direction,
implicit_fb ? SND_USB_ENDPOINT_TYPE_DATA);
SND_USB_ENDPOINT_TYPE_DATA :
SND_USB_ENDPOINT_TYPE_SYNC);
if (!subs->sync_endpoint) if (!subs->sync_endpoint)
return -EINVAL; return -EINVAL;