ath6kl: fix control-message timeout
authorJohan Hovold <johan@kernel.org>
Mon, 25 Oct 2021 12:05:20 +0000 (14:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:15:58 +0000 (19:15 +0100)
commit a066d28a7e729f808a3e6eff22e70c003091544e upstream.

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

Fixes: 241b128b6b69 ("ath6kl: add back beginnings of USB support")
Cc: stable@vger.kernel.org # 3.4
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211025120522.6045-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/ath/ath6kl/usb.c

index a917092b259ce2d033638b09de744f083c6f049d..aba70f35e574b96092f4bd068b76208b535443c5 100644 (file)
@@ -912,7 +912,7 @@ static int ath6kl_usb_submit_ctrl_in(struct ath6kl_usb *ar_usb,
                                 req,
                                 USB_DIR_IN | USB_TYPE_VENDOR |
                                 USB_RECIP_DEVICE, value, index, buf,
-                                size, 2 * HZ);
+                                size, 2000);
 
        if (ret < 0) {
                ath6kl_warn("Failed to read usb control message: %d\n", ret);