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

Commit 7dc56c24 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

rtl8187: fix control-message timeouts 



commit 2e9be536a213e838daed6ba42024dd68954ac061 upstream.

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

Fixes: 605bebe2 ("[PATCH] Add rtl8187 wireless driver")
Cc: stable@vger.kernel.org      # 2.6.23
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211025120522.6045-4-johan@kernel.org


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

drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ u8 rtl818x_ioread8_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),

			RTL8187_REQ_GET_REG, RTL8187_REQT_READ,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits8, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits8, sizeof(val), 500);



	val = priv->io_dmabuf->bits8;

	mutex_unlock(&priv->io_mutex);
@@ -48,7 +48,7 @@ u16 rtl818x_ioread16_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),

			RTL8187_REQ_GET_REG, RTL8187_REQT_READ,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits16, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits16, sizeof(val), 500);



	val = priv->io_dmabuf->bits16;

	mutex_unlock(&priv->io_mutex);
@@ -65,7 +65,7 @@ u32 rtl818x_ioread32_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),

			RTL8187_REQ_GET_REG, RTL8187_REQT_READ,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits32, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits32, sizeof(val), 500);



	val = priv->io_dmabuf->bits32;

	mutex_unlock(&priv->io_mutex);
@@ -82,7 +82,7 @@ void rtl818x_iowrite8_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),

			RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits8, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits8, sizeof(val), 500);



	mutex_unlock(&priv->io_mutex);

}
@@ -96,7 +96,7 @@ void rtl818x_iowrite16_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),

			RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits16, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits16, sizeof(val), 500);



	mutex_unlock(&priv->io_mutex);

}
@@ -110,7 +110,7 @@ void rtl818x_iowrite32_idx(struct rtl8187_priv *priv, 
	usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),

			RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,

			(unsigned long)addr, idx & 0x03,

			&priv->io_dmabuf->bits32, sizeof(val), HZ / 2);

			&priv->io_dmabuf->bits32, sizeof(val), 500);



	mutex_unlock(&priv->io_mutex);

}
@@ -186,7 +186,7 @@ static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, __le16 data) 
	usb_control_msg(priv->udev, usb_sndctrlpipe(priv->udev, 0),

			RTL8187_REQ_SET_REG, RTL8187_REQT_WRITE,

			addr, 0x8225, &priv->io_dmabuf->bits16, sizeof(data),

			HZ / 2);

			500);



	mutex_unlock(&priv->io_mutex);