]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 11 Jul 2021 18:06:57 +0000 (20:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 11 Jul 2021 18:06:57 +0000 (20:06 +0200)
added patches:
mmc-vub3000-fix-control-request-direction.patch

queue-4.4/mmc-vub3000-fix-control-request-direction.patch [new file with mode: 0644]
queue-4.4/series

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 (file)
index 0000000..b04ad07
--- /dev/null
@@ -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);
index 0ab4ff241f52f194940eedf2b05c8c5b904b7f1d..350df4b0ae2d8305d6251daf2e4c051f56c66cee 100644 (file)
@@ -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