| Message ID | 20211025120522.6045-2-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5286132324230168d3fab6ffc16bfd7de85bdfb4 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wireless: fix control-message timeouts | expand |
Johan Hovold <johan@kernel.org> wrote: > USB control-message timeouts are specified in milliseconds and should > specifically not vary with CONFIG_HZ. > > Fixes: 4db66499df91 ("ath10k: add initial USB support") > Cc: stable@vger.kernel.org # 4.14 > Cc: Erik Stromdahl <erik.stromdahl@gmail.com> > Signed-off-by: Johan Hovold <johan@kernel.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 2 patches applied to ath-next branch of ath.git, thanks. 528613232423 ath10k: fix control-message timeout a066d28a7e72 ath6kl: fix control-message timeout
diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c index 19b9c27e30e2..6d831b098cbb 100644 --- a/drivers/net/wireless/ath/ath10k/usb.c +++ b/drivers/net/wireless/ath/ath10k/usb.c @@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(struct ath10k *ar, req, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value, index, buf, - size, 2 * HZ); + size, 2000); if (ret < 0) { ath10k_warn(ar, "Failed to read usb control message: %d\n",
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 4db66499df91 ("ath10k: add initial USB support") Cc: stable@vger.kernel.org # 4.14 Cc: Erik Stromdahl <erik.stromdahl@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/net/wireless/ath/ath10k/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)