提交 4cfa36d3 编写于 作者: J Johan Hovold 提交者: Greg Kroah-Hartman

staging: rtl8192u: fix control-message timeouts

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

Fixes: 8fc8598e ("Staging: Added Realtek rtl8192u driver to staging")
Cc: stable@vger.kernel.org      # 2.6.33
Acked-by: NLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: NJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025120910.6339-2-johan@kernel.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 dcf7be79
...@@ -226,7 +226,7 @@ int write_nic_byte_E(struct net_device *dev, int indx, u8 data) ...@@ -226,7 +226,7 @@ int write_nic_byte_E(struct net_device *dev, int indx, u8 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
indx | 0xfe00, 0, usbdata, 1, HZ / 2); indx | 0xfe00, 0, usbdata, 1, 500);
kfree(usbdata); kfree(usbdata);
if (status < 0) { if (status < 0) {
...@@ -248,7 +248,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8 *data) ...@@ -248,7 +248,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
indx | 0xfe00, 0, usbdata, 1, HZ / 2); indx | 0xfe00, 0, usbdata, 1, 500);
*data = *usbdata; *data = *usbdata;
kfree(usbdata); kfree(usbdata);
...@@ -276,7 +276,7 @@ int write_nic_byte(struct net_device *dev, int indx, u8 data) ...@@ -276,7 +276,7 @@ int write_nic_byte(struct net_device *dev, int indx, u8 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 1, HZ / 2); usbdata, 1, 500);
kfree(usbdata); kfree(usbdata);
if (status < 0) { if (status < 0) {
...@@ -302,7 +302,7 @@ int write_nic_word(struct net_device *dev, int indx, u16 data) ...@@ -302,7 +302,7 @@ int write_nic_word(struct net_device *dev, int indx, u16 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 2, HZ / 2); usbdata, 2, 500);
kfree(usbdata); kfree(usbdata);
if (status < 0) { if (status < 0) {
...@@ -328,7 +328,7 @@ int write_nic_dword(struct net_device *dev, int indx, u32 data) ...@@ -328,7 +328,7 @@ int write_nic_dword(struct net_device *dev, int indx, u32 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 4, HZ / 2); usbdata, 4, 500);
kfree(usbdata); kfree(usbdata);
if (status < 0) { if (status < 0) {
...@@ -352,7 +352,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8 *data) ...@@ -352,7 +352,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8 *data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 1, HZ / 2); usbdata, 1, 500);
*data = *usbdata; *data = *usbdata;
kfree(usbdata); kfree(usbdata);
...@@ -377,7 +377,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data) ...@@ -377,7 +377,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 2, HZ / 2); usbdata, 2, 500);
*data = *usbdata; *data = *usbdata;
kfree(usbdata); kfree(usbdata);
...@@ -401,7 +401,7 @@ static int read_nic_word_E(struct net_device *dev, int indx, u16 *data) ...@@ -401,7 +401,7 @@ static int read_nic_word_E(struct net_device *dev, int indx, u16 *data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
indx | 0xfe00, 0, usbdata, 2, HZ / 2); indx | 0xfe00, 0, usbdata, 2, 500);
*data = *usbdata; *data = *usbdata;
kfree(usbdata); kfree(usbdata);
...@@ -427,7 +427,7 @@ int read_nic_dword(struct net_device *dev, int indx, u32 *data) ...@@ -427,7 +427,7 @@ int read_nic_dword(struct net_device *dev, int indx, u32 *data)
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
(indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
usbdata, 4, HZ / 2); usbdata, 4, 500);
*data = *usbdata; *data = *usbdata;
kfree(usbdata); kfree(usbdata);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册