tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: rtl8192u: fix control-message timeouts

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

Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging")
Cc: stable@vger.kernel.org # 2.6.33
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025120910.6339-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Johan Hovold and committed by
Greg Kroah-Hartman 4cfa36d3 dcf7be79

+9 -9
+9 -9
drivers/staging/rtl8192u/r8192U_core.c
··· 226 226 227 227 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 228 228 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 229 - indx | 0xfe00, 0, usbdata, 1, HZ / 2); 229 + indx | 0xfe00, 0, usbdata, 1, 500); 230 230 kfree(usbdata); 231 231 232 232 if (status < 0) { ··· 248 248 249 249 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 250 250 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 251 - indx | 0xfe00, 0, usbdata, 1, HZ / 2); 251 + indx | 0xfe00, 0, usbdata, 1, 500); 252 252 *data = *usbdata; 253 253 kfree(usbdata); 254 254 ··· 276 276 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 277 277 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 278 278 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 279 - usbdata, 1, HZ / 2); 279 + usbdata, 1, 500); 280 280 kfree(usbdata); 281 281 282 282 if (status < 0) { ··· 302 302 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 303 303 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 304 304 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 305 - usbdata, 2, HZ / 2); 305 + usbdata, 2, 500); 306 306 kfree(usbdata); 307 307 308 308 if (status < 0) { ··· 328 328 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 329 329 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 330 330 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 331 - usbdata, 4, HZ / 2); 331 + usbdata, 4, 500); 332 332 kfree(usbdata); 333 333 334 334 if (status < 0) { ··· 352 352 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 353 353 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 354 354 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 355 - usbdata, 1, HZ / 2); 355 + usbdata, 1, 500); 356 356 *data = *usbdata; 357 357 kfree(usbdata); 358 358 ··· 377 377 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 378 378 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 379 379 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 380 - usbdata, 2, HZ / 2); 380 + usbdata, 2, 500); 381 381 *data = *usbdata; 382 382 kfree(usbdata); 383 383 ··· 401 401 402 402 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 403 403 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 404 - indx | 0xfe00, 0, usbdata, 2, HZ / 2); 404 + indx | 0xfe00, 0, usbdata, 2, 500); 405 405 *data = *usbdata; 406 406 kfree(usbdata); 407 407 ··· 427 427 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 428 428 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 429 429 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 430 - usbdata, 4, HZ / 2); 430 + usbdata, 4, 500); 431 431 *data = *usbdata; 432 432 kfree(usbdata); 433 433