Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 88abb8eff494d0be7819e744e74d62d5bc852905

Authored by Eldad Zack
Committed by Takashi Iwai
1 parent 914273c714
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 1 additions and 7 deletions Side-by-side Diff

... ... @@ -334,7 +334,6 @@
334 334 {
335 335 struct usb_host_interface *alts;
336 336 struct usb_interface *iface;
337   - int implicit_fb = 0;
338 337 unsigned int ep;
339 338  
340 339 /* Implicit feedback sync EPs consumers are always playback EPs */
... ... @@ -344,7 +343,6 @@
344 343 switch (subs->stream->chip->usb_id) {
345 344 case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
346 345 case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */
347   - implicit_fb = 1;
348 346 ep = 0x81;
349 347 iface = usb_ifnum_to_if(dev, 3);
350 348  
... ... @@ -356,7 +354,6 @@
356 354 break;
357 355 case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */
358 356 case USB_ID(0x0763, 0x2081):
359   - implicit_fb = 1;
360 357 ep = 0x81;
361 358 iface = usb_ifnum_to_if(dev, 2);
362 359  
... ... @@ -374,7 +371,6 @@
374 371 search_roland_implicit_fb(dev, altsd->bInterfaceNumber + 1,
375 372 altsd->bAlternateSetting,
376 373 &alts, &ep) >= 0) {
377   - implicit_fb = 1;
378 374 goto add_sync_ep;
379 375 }
380 376  
... ... @@ -384,9 +380,7 @@
384 380 add_sync_ep:
385 381 subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip,
386 382 alts, ep, !subs->direction,
387   - implicit_fb ?
388   - SND_USB_ENDPOINT_TYPE_DATA :
389   - SND_USB_ENDPOINT_TYPE_SYNC);
  383 + SND_USB_ENDPOINT_TYPE_DATA);
390 384 if (!subs->sync_endpoint)
391 385 return -EINVAL;
392 386