Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9cf968 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: trancevibrator: fix control-request direction 



commit 746e4acf87bcacf1406e05ef24a0b7139147c63e 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-speed request which erroneously used USB_DIR_IN and update
the default timeout argument to match (same value).

Fixes: 5638e4d9 ("USB: add PlayStation 2 Trance Vibrator driver")
Cc: stable@vger.kernel.org      # 2.6.19
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210521133109.17396-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62556a72

drivers/usb/misc/trancevibrator.c

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ static ssize_t set_speed(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);