Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452a2988 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: fix control-message timeouts 



commit 4cfa36d312d6789448b59a7aae770ac8425017a3 upstream.

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025120910.6339-2-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8421e749

drivers/staging/rtl8192u/r8192U_core.c

+9 −9
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ int 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) {
@@ -288,7 +288,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);
@@ -316,7 +316,7 @@ int 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) {
@@ -343,7 +343,7 @@ int 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) {
@@ -370,7 +370,7 @@ int 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);
@@ -397,7 +397,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);
@@ -424,7 +424,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);
@@ -448,7 +448,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);
@@ -474,7 +474,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);