]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Input: iforce - fix control-message timeout
authorJohan Hovold <johan@kernel.org>
Wed, 10 Nov 2021 06:58:01 +0000 (22:58 -0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:06 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
commit 744d0090a5f6dfa4c81b53402ccdf08313100429 upstream.

USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Fixes: 487358627825 ("Input: iforce - use DMA-safe buffer when getting IDs from USB")
Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: stable@vger.kernel.org # 5.3
Link: https://lore.kernel.org/r/20211025115501.5190-1-johan@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/input/joystick/iforce/iforce-usb.c

index 6c554c11a7ac3f35a33b318f7f6bef589a8c6b81..ea58805c480fa91c9d2dfdfec4d857200986021f 100644 (file)
@@ -92,7 +92,7 @@ static int iforce_usb_get_id(struct iforce *iforce, u8 id,
                                 id,
                                 USB_TYPE_VENDOR | USB_DIR_IN |
                                        USB_RECIP_INTERFACE,
-                                0, 0, buf, IFORCE_MAX_LENGTH, HZ);
+                                0, 0, buf, IFORCE_MAX_LENGTH, 1000);
        if (status < 0) {
                dev_err(&iforce_usb->intf->dev,
                        "usb_submit_urb failed: %d\n", status);