staging: r8712u: fix control-message timeout
authorJohan Hovold <johan@kernel.org>
Mon, 25 Oct 2021 12:09:10 +0000 (14:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Nov 2021 14:05:51 +0000 (15:05 +0100)
commit ce4940525f36ffdcf4fa623bcedab9c2a6db893a upstream.

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

Fixes: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel")
Cc: stable@vger.kernel.org # 2.6.37
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025120910.6339-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/usb_ops_linux.c

index 655497cead12231ebe81636e0bd6baab5b297a41..f984a5ab2c6ff713cc40696ef9e6a8fd5d02509b 100644 (file)
@@ -494,7 +494,7 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value,
                memcpy(pIo_buf, pdata, len);
        }
        status = usb_control_msg(udev, pipe, request, reqtype, value, index,
-                                pIo_buf, len, HZ / 2);
+                                pIo_buf, len, 500);
        if (status > 0) {  /* Success this control transfer. */
                if (requesttype == 0x01) {
                        /* For Control read transfer, we have to copy the read