| From 2e9be536a213e838daed6ba42024dd68954ac061 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Mon, 25 Oct 2021 14:05:21 +0200 |
| Subject: rtl8187: fix control-message timeouts |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 2e9be536a213e838daed6ba42024dd68954ac061 upstream. |
| |
| USB control-message timeouts are specified in milliseconds and should |
| specifically not vary with CONFIG_HZ. |
| |
| Fixes: 605bebe23bf6 ("[PATCH] Add rtl8187 wireless driver") |
| Cc: stable@vger.kernel.org # 2.6.23 |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Link: https://lore.kernel.org/r/20211025120522.6045-4-johan@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c |
| +++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c |
| @@ -28,7 +28,7 @@ u8 rtl818x_ioread8_idx(struct rtl8187_pr |
| 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); |
| @@ -45,7 +45,7 @@ u16 rtl818x_ioread16_idx(struct rtl8187_ |
| 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); |
| @@ -62,7 +62,7 @@ u32 rtl818x_ioread32_idx(struct rtl8187_ |
| 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); |
| @@ -79,7 +79,7 @@ void rtl818x_iowrite8_idx(struct rtl8187 |
| 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); |
| } |
| @@ -93,7 +93,7 @@ void rtl818x_iowrite16_idx(struct rtl818 |
| 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); |
| } |
| @@ -107,7 +107,7 @@ void rtl818x_iowrite32_idx(struct rtl818 |
| 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); |
| } |
| @@ -183,7 +183,7 @@ static void rtl8225_write_8051(struct ie |
| 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); |
| |