summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2021-10-25 14:05:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-12 14:43:05 +0100
commitabc49cc45d0ada0b9d147f2873ef439ba5c7e2b7 (patch)
treefb172712146eb26ac306c321a0b608e5cb1e12dd
parent64e6632ab4c11dde13083f9529d4fa9a9e919ae4 (diff)
downloadlinux-stable-abc49cc45d0ada0b9d147f2873ef439ba5c7e2b7.tar.gz
linux-stable-abc49cc45d0ada0b9d147f2873ef439ba5c7e2b7.tar.bz2
linux-stable-abc49cc45d0ada0b9d147f2873ef439ba5c7e2b7.zip
rsi: fix control-message timeout
commit 541fd20c3ce5b0bc39f0c6a52414b6b92416831c upstream. USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Use the common control-message timeout define for the five-second timeout. Fixes: dad0d04fa7ba ("rsi: Add RS9113 wireless driver") Cc: stable@vger.kernel.org # 3.15 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20211025120522.6045-5-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/rsi/rsi_91x_usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index e8aa3d4bda88..1e5a2a0cc670 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -61,7 +61,7 @@ static int rsi_usb_card_write(struct rsi_hw *adapter,
(void *)seg,
(int)len,
&transfer,
- HZ * 5);
+ USB_CTRL_SET_TIMEOUT);
if (status < 0) {
rsi_dbg(ERR_ZONE,