From 746e4acf87bcacf1406e05ef24a0b7139147c63e Mon Sep 17 00:00:00 2001

From: Johan Hovold <johan@kernel.org>

Date: Fri, 21 May 2021 15:31:09 +0200

Subject: [PATCH] USB: trancevibrator: fix control-request direction

Git-commit: 746e4acf87bcacf1406e05ef24a0b7139147c63e

Patch-mainline: v5.13-rc4

References: git-fixes

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-speed request which erroneously used USB_DIR_IN and update

the default timeout argument to match (same value).

Fixes: 5638e4d92e77 ("USB: add PlayStation 2 Trance Vibrator driver")

Cc: stable@vger.kernel.org      # 2.6.19

Signed-off-by: Johan Hovold <johan@kernel.org>

Link: https://lore.kernel.org/r/20210521133109.17396-1-johan@kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

---

 drivers/usb/misc/trancevibrator.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c

index a3dfc77578ea..26baba3ab7d7 100644

--- a/drivers/usb/misc/trancevibrator.c

+++ b/drivers/usb/misc/trancevibrator.c

@@ -61,9 +61,9 @@ static ssize_t speed_store(struct device *dev, struct device_attribute *attr,

 	/* Set speed */

 	retval = usb_control_msg(tv->udev, usb_sndctrlpipe(tv->udev, 0),

 				 0x01, /* vendor request: set speed */

-				 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,

+				 USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,

 				 tv->speed, /* speed value */

-				 0, NULL, 0, USB_CTRL_GET_TIMEOUT);

+				 0, NULL, 0, USB_CTRL_SET_TIMEOUT);

 	if (retval) {

 		tv->speed = old;

 		dev_dbg(&tv->udev->dev, "retval = %d\n", retval);

-- 

2.26.2