|
Oliver Neukum |
49a646 |
From 5286132324230168d3fab6ffc16bfd7de85bdfb4 Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
49a646 |
From: Johan Hovold <johan@kernel.org>
|
|
Oliver Neukum |
49a646 |
Date: Mon, 25 Oct 2021 14:05:19 +0200
|
|
Oliver Neukum |
49a646 |
Subject: [PATCH] ath10k: fix control-message timeout
|
|
Oliver Neukum |
49a646 |
Git-commit: 5286132324230168d3fab6ffc16bfd7de85bdfb4
|
|
Oliver Neukum |
49a646 |
References: git-fixes
|
|
Oliver Neukum |
49a646 |
Patch-mainline: v5.16-rc1
|
|
Oliver Neukum |
49a646 |
|
|
Oliver Neukum |
49a646 |
USB control-message timeouts are specified in milliseconds and should
|
|
Oliver Neukum |
49a646 |
specifically not vary with CONFIG_HZ.
|
|
Oliver Neukum |
49a646 |
|
|
Oliver Neukum |
49a646 |
Fixes: 4db66499df91 ("ath10k: add initial USB support")
|
|
Oliver Neukum |
49a646 |
Cc: stable@vger.kernel.org # 4.14
|
|
Oliver Neukum |
49a646 |
Cc: Erik Stromdahl <erik.stromdahl@gmail.com>
|
|
Oliver Neukum |
49a646 |
Signed-off-by: Johan Hovold <johan@kernel.org>
|
|
Oliver Neukum |
49a646 |
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Oliver Neukum |
49a646 |
Link: https://lore.kernel.org/r/20211025120522.6045-2-johan@kernel.org
|
|
Oliver Neukum |
49a646 |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
49a646 |
---
|
|
Oliver Neukum |
49a646 |
drivers/net/wireless/ath/ath10k/usb.c | 2 +-
|
|
Oliver Neukum |
49a646 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Oliver Neukum |
49a646 |
|
|
Oliver Neukum |
49a646 |
diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
|
|
Oliver Neukum |
49a646 |
index 19b9c27e30e2..6d831b098cbb 100644
|
|
Oliver Neukum |
49a646 |
--- a/drivers/net/wireless/ath/ath10k/usb.c
|
|
Oliver Neukum |
49a646 |
+++ b/drivers/net/wireless/ath/ath10k/usb.c
|
|
Oliver Neukum |
49a646 |
@@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(struct ath10k *ar,
|
|
Oliver Neukum |
49a646 |
req,
|
|
Oliver Neukum |
49a646 |
USB_DIR_IN | USB_TYPE_VENDOR |
|
|
Oliver Neukum |
49a646 |
USB_RECIP_DEVICE, value, index, buf,
|
|
Oliver Neukum |
49a646 |
- size, 2 * HZ);
|
|
Oliver Neukum |
49a646 |
+ size, 2000);
|
|
Oliver Neukum |
49a646 |
|
|
Oliver Neukum |
49a646 |
if (ret < 0) {
|
|
Oliver Neukum |
49a646 |
ath10k_warn(ar, "Failed to read usb control message: %d\n",
|
|
Oliver Neukum |
49a646 |
--
|
|
Oliver Neukum |
49a646 |
2.40.0
|
|
Oliver Neukum |
49a646 |
|