Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 914273c7 authored by Eldad Zack's avatar Eldad Zack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: remove is_playback from implicit feedback quirks 



An implicit feedback endpoint can only be a capture source. The
consumer (sink) of the implicit feedback endpoint is therefore limited
to playback EPs.
Check if the target endpoint is a playback first and remove redundant
checks.

Signed-off-by: default avatarEldad Zack <eldad@fogrefinery.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 95fec883

sound/usb/pcm.c

+19 −21
Original line number Diff line number Diff line
@@ -334,14 +334,16 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, 
{

	struct usb_host_interface *alts;

	struct usb_interface *iface;

	int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK;

	int implicit_fb = 0;

	unsigned int ep;



	/* Implicit feedback sync EPs consumers are always playback EPs */

	if (subs->direction != SNDRV_PCM_STREAM_PLAYBACK)

		return 0;



	switch (subs->stream->chip->usb_id) {

	case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */

	case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */

		if (is_playback) {

		implicit_fb = 1;

		ep = 0x81;

		iface = usb_ifnum_to_if(dev, 3);
@@ -351,11 +353,9 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, 


		alts = &iface->altsetting[1];

		goto add_sync_ep;

		}

		break;

	case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */

	case USB_ID(0x0763, 0x2081):

		if (is_playback) {

		implicit_fb = 1;

		ep = 0x81;

		iface = usb_ifnum_to_if(dev, 2);
@@ -366,9 +366,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, 
		alts = &iface->altsetting[1];

		goto add_sync_ep;

	}

	}

	if (is_playback &&

	    attr == USB_ENDPOINT_SYNC_ASYNC &&

	if (attr == USB_ENDPOINT_SYNC_ASYNC &&

	    altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC &&

	    altsd->bInterfaceProtocol == 2 &&

	    altsd->bNumEndpoints == 1 &&