]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: rtl8192u: fix control-message timeouts
authorJohan Hovold <johan@kernel.org>
Mon, 25 Oct 2021 12:09:09 +0000 (14:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Nov 2021 12:17:08 +0000 (13:17 +0100)
commit 4cfa36d312d6789448b59a7aae770ac8425017a3 upstream.

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

Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging")
Cc: stable@vger.kernel.org # 2.6.33
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025120910.6339-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/r8192U_core.c

index 72dabbf19bc7c4a01f9871a1146244dcc8fb2053..a8a4e45a2e512f8703f1994ff9713b2cf5b9d8a0 100644 (file)
@@ -267,7 +267,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
 
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-                                indx | 0xfe00, 0, usbdata, 1, HZ / 2);
+                                indx | 0xfe00, 0, usbdata, 1, 500);
        kfree(usbdata);
 
        if (status < 0)
@@ -287,7 +287,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                                indx | 0xfe00, 0, usbdata, 1, HZ / 2);
+                                indx | 0xfe00, 0, usbdata, 1, 500);
        *data = *usbdata;
        kfree(usbdata);
 
@@ -314,7 +314,7 @@ void write_nic_byte(struct net_device *dev, int indx, u8 data)
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 1, HZ / 2);
+                                usbdata, 1, 500);
        kfree(usbdata);
 
        if (status < 0)
@@ -340,7 +340,7 @@ void write_nic_word(struct net_device *dev, int indx, u16 data)
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 2, HZ / 2);
+                                usbdata, 2, 500);
        kfree(usbdata);
 
        if (status < 0)
@@ -365,7 +365,7 @@ void write_nic_dword(struct net_device *dev, int indx, u32 data)
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 4, HZ / 2);
+                                usbdata, 4, 500);
        kfree(usbdata);
 
 
@@ -390,7 +390,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8 *data)
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 1, HZ / 2);
+                                usbdata, 1, 500);
        *data = *usbdata;
        kfree(usbdata);
 
@@ -417,7 +417,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data)
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 2, HZ / 2);
+                                usbdata, 2, 500);
        *data = *usbdata;
        kfree(usbdata);
 
@@ -441,7 +441,7 @@ static int read_nic_word_E(struct net_device *dev, int indx, u16 *data)
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                                indx | 0xfe00, 0, usbdata, 2, HZ / 2);
+                                indx | 0xfe00, 0, usbdata, 2, 500);
        *data = *usbdata;
        kfree(usbdata);
 
@@ -467,7 +467,7 @@ int read_nic_dword(struct net_device *dev, int indx, u32 *data)
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
                                 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
-                                usbdata, 4, HZ / 2);
+                                usbdata, 4, 500);
        *data = *usbdata;
        kfree(usbdata);