]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
rsi: fix control-message timeout
authorJohan Hovold <johan@kernel.org>
Mon, 25 Oct 2021 12:05:22 +0000 (14:05 +0200)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 7 Dec 2021 06:32:25 +0000 (07:32 +0100)
BugLink: https://bugs.launchpad.net/bugs/1950949
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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/net/wireless/rsi/rsi_91x_usb.c

index 416976f098882f35066338c05ee5354d918e2cf1..e97f92915ed98d6776b15bf7b472bb61b88f3c00 100644 (file)
@@ -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,