ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid
authorArd van Breemen <ard@kwaak.net>
Fri, 2 Aug 2019 11:52:14 +0000 (13:52 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 10:47:48 +0000 (12:47 +0200)
[ Upstream commit 1b34121d9f26d272b0b2334209af6b6fc82d4bf1 ]

The Linux kernel assumes that get_endpoint(alts,0) and
get_endpoint(alts,1) are eachothers feedback endpoints.
To reassure that validity it will test bsynchaddress to comply with that
assumption. But if the bsyncaddress is 0 (invalid), it will flag that as
a wrong assumption and return an error.
Fix: Skip the test if bSynchAddress is 0.
Note: those with a valid bSynchAddress should have a code quirck added.

Signed-off-by: Ard van Breemen <ard@kwaak.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/usb/pcm.c

index b1a1eb1f65aa34d89b07c7dfb6badbc34c1b3a2e..ff38fca1781b6ef30fce456d15dae594db920295 100644 (file)
@@ -470,6 +470,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
        }
        ep = get_endpoint(alts, 1)->bEndpointAddress;
        if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
+           get_endpoint(alts, 0)->bSynchAddress != 0 &&
            ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) ||
             (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) {
                dev_err(&dev->dev,