From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 11 Jul 2021 18:06:57 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v5.4.132~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e38cbe16774ec937353d3072484f1570b27827c5;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	mmc-vub3000-fix-control-request-direction.patch
---

diff --git a/queue-4.4/mmc-vub3000-fix-control-request-direction.patch b/queue-4.4/mmc-vub3000-fix-control-request-direction.patch
new file mode 100644
index 00000000000..b04ad076389
--- /dev/null
+++ b/queue-4.4/mmc-vub3000-fix-control-request-direction.patch
@@ -0,0 +1,38 @@
+From 3c0bb3107703d2c58f7a0a7a2060bb57bc120326 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan@kernel.org>
+Date: Fri, 21 May 2021 15:30:26 +0200
+Subject: mmc: vub3000: fix control-request direction
+
+From: Johan Hovold <johan@kernel.org>
+
+commit 3c0bb3107703d2c58f7a0a7a2060bb57bc120326 upstream.
+
+The direction of the pipe argument must match the request-type direction
+bit or control requests may fail depending on the host-controller-driver
+implementation.
+
+Fix the SET_ROM_WAIT_STATES request which erroneously used
+usb_rcvctrlpipe().
+
+Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver")
+Cc: stable@vger.kernel.org      # 3.0
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Link: https://lore.kernel.org/r/20210521133026.17296-1-johan@kernel.org
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/host/vub300.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/vub300.c
++++ b/drivers/mmc/host/vub300.c
+@@ -2294,7 +2294,7 @@ static int vub300_probe(struct usb_inter
+ 	if (retval < 0)
+ 		goto error5;
+ 	retval =
+-		usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0),
++		usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0),
+ 				SET_ROM_WAIT_STATES,
+ 				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ 				firmware_rom_wait_states, 0x0000, NULL, 0, HZ);
diff --git a/queue-4.4/series b/queue-4.4/series
index 0ab4ff241f5..350df4b0ae2 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -89,3 +89,4 @@ scsi-mpt3sas-fix-error-return-value-in-_scsih_expand.patch
 phy-ti-dm816x-fix-the-error-handling-path-in-dm816x_.patch
 extcon-sm5502-drop-invalid-register-write-in-sm5502_.patch
 extcon-max8997-add-missing-modalias-string.patch
+mmc-vub3000-fix-control-request-direction.patch