From 764fa6e686e0107c0357a988d193de04cf047583 Mon Sep 17 00:00:00 2001

From: "Geoffrey D. Bennett" <g@b4.vu>

Date: Fri, 21 May 2021 17:50:12 +0930

Subject: [PATCH] ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci

Git-commit: 764fa6e686e0107c0357a988d193de04cf047583

Patch-mainline: v5.13-rc4

References: git-fixes

Use usb_rcvctrlpipe() not usb_sndctrlpipe() for USB control input in

the Scarlett Gen 2 mixer driver. This fixes the device hang during

initialisation when used with the ehci-pci host driver.

Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface")

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>

Cc: <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/66a3d05dac325d5b53e4930578e143cef1f50dbe.1621584566.git.g@b4.vu

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 sound/usb/mixer_scarlett_gen2.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c

index 560c2ade829d..dcff3e3a49f3 100644

--- a/sound/usb/mixer_scarlett_gen2.c

+++ b/sound/usb/mixer_scarlett_gen2.c

@@ -635,7 +635,7 @@ static int scarlett2_usb(

 	/* send a second message to get the response */

 	err = snd_usb_ctl_msg(mixer->chip->dev,

-			usb_sndctrlpipe(mixer->chip->dev, 0),

+			usb_rcvctrlpipe(mixer->chip->dev, 0),

 			SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP,

 			USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

 			0,

-- 

2.26.2