diff options
| author | Johan Hovold <johan@kernel.org> | 2021-10-25 14:09:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-12 13:17:08 +0100 |
| commit | dc8f5cfd5cf19fdb107a8282539ee6687e12d778 (patch) | |
| tree | 62efd9486eb99db45dc1426d2010b5eaacc0dc80 | |
| parent | eeb2451e30abb66c72f05a98a2a655e7ec348b7d (diff) | |
| download | linux-stable-dc8f5cfd5cf19fdb107a8282539ee6687e12d778.tar.gz linux-stable-dc8f5cfd5cf19fdb107a8282539ee6687e12d778.tar.bz2 linux-stable-dc8f5cfd5cf19fdb107a8282539ee6687e12d778.zip | |
staging: r8712u: fix control-message timeout
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>
| -rw-r--r-- | drivers/staging/rtl8712/usb_ops_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 489a9e6d52fc..fd4f1859cdae 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -511,7 +511,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 |