aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-08-03 04:51:14 -0400
committerTakashi Iwai <tiwai@suse.de>2013-08-06 04:52:14 -0400
commit88abb8eff494d0be7819e744e74d62d5bc852905 (patch)
tree0f9f4b9ddcc103e0f9ff4d75b6cc352bedc1f6dc /sound/usb
parent914273c714845e2f3363e962f6dff59626a79fa3 (diff)
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>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/pcm.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index af30e08e3d3b..b375d58871e7 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -334,7 +334,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
334{ 334{
335 struct usb_host_interface *alts; 335 struct usb_host_interface *alts;
336 struct usb_interface *iface; 336 struct usb_interface *iface;
337 int implicit_fb = 0;
338 unsigned int ep; 337 unsigned int ep;
339 338
340 /* Implicit feedback sync EPs consumers are always playback EPs */ 339 /* 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,
344 switch (subs->stream->chip->usb_id) { 343 switch (subs->stream->chip->usb_id) {
345 case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ 344 case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
346 case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */ 345 case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */
347 implicit_fb = 1;
348 ep = 0x81; 346 ep = 0x81;
349 iface = usb_ifnum_to_if(dev, 3); 347 iface = usb_ifnum_to_if(dev, 3);
350 348
@@ -356,7 +354,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
356 break; 354 break;
357 case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */ 355 case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */
358 case USB_ID(0x0763, 0x2081): 356 case USB_ID(0x0763, 0x2081):
359 implicit_fb = 1;
360 ep = 0x81; 357 ep = 0x81;
361 iface = usb_ifnum_to_if(dev, 2); 358 iface = usb_ifnum_to_if(dev, 2);
362 359
@@ -374,7 +371,6 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
374 search_roland_implicit_fb(dev, altsd->bInterfaceNumber + 1, 371 search_roland_implicit_fb(dev, altsd->bInterfaceNumber + 1,
375 altsd->bAlternateSetting, 372 altsd->bAlternateSetting,
376 &alts, &ep) >= 0) { 373 &alts, &ep) >= 0) {
377 implicit_fb = 1;
378 goto add_sync_ep; 374 goto add_sync_ep;
379 } 375 }
380 376
@@ -384,9 +380,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
384add_sync_ep: 380add_sync_ep:
385 subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip, 381 subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip,
386 alts, ep, !subs->direction, 382 alts, ep, !subs->direction,
387 implicit_fb ? 383 SND_USB_ENDPOINT_TYPE_DATA);
388 SND_USB_ENDPOINT_TYPE_DATA :
389 SND_USB_ENDPOINT_TYPE_SYNC);
390 if (!subs->sync_endpoint) 384 if (!subs->sync_endpoint)
391 return -EINVAL; 385 return -EINVAL;
392 386