| Message ID | 20211025120910.6339-3-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ce4940525f36ffdcf4fa623bcedab9c2a6db893a |
| Headers | show |
| Series | staging: fix control-message timeouts | expand |
On 10/25/21 07:09, Johan Hovold wrote: > 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 > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > drivers/staging/rtl8712/usb_ops_linux.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Larry Finger <Larry.Finger@lwfinger.net> > > diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c > index 655497cead12..f984a5ab2c6f 100644 > --- a/drivers/staging/rtl8712/usb_ops_linux.c > +++ b/drivers/staging/rtl8712/usb_ops_linux.c > @@ -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 >
diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 655497cead12..f984a5ab2c6f 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -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
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 Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/staging/rtl8712/usb_ops_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)