* [PATCH 0/2] staging: fix control-message timeouts @ 2021-10-25 12:09 Johan Hovold 2021-10-25 12:09 ` [PATCH 1/2] staging: rtl8192u: " Johan Hovold 2021-10-25 12:09 ` [PATCH 2/2] staging: r8712u: fix control-message timeout Johan Hovold 0 siblings, 2 replies; 11+ messages in thread From: Johan Hovold @ 2021-10-25 12:09 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Larry Finger, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, Johan Hovold A number of drivers throughout the tree were incorrectly specifying USB message timeout values in jiffies instead of milliseconds. This series fixes the staging drivers that got it wrong. Johan Johan Hovold (2): staging: rtl8192u: fix control-message timeouts staging: r8712u: fix control-message timeout drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++--------- drivers/staging/rtl8712/usb_ops_linux.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) -- 2.32.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] staging: rtl8192u: fix control-message timeouts 2021-10-25 12:09 [PATCH 0/2] staging: fix control-message timeouts Johan Hovold @ 2021-10-25 12:09 ` Johan Hovold 2021-10-25 15:06 ` Larry Finger 2021-10-25 12:09 ` [PATCH 2/2] staging: r8712u: fix control-message timeout Johan Hovold 1 sibling, 1 reply; 11+ messages in thread From: Johan Hovold @ 2021-10-25 12:09 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Larry Finger, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, Johan Hovold, stable 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 Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index b6698656fc01..cf5cfee2936f 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -229,7 +229,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) { @@ -251,7 +251,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); @@ -279,7 +279,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) { @@ -305,7 +305,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) { @@ -331,7 +331,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); if (status < 0) { @@ -355,7 +355,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); @@ -380,7 +380,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); @@ -404,7 +404,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); @@ -430,7 +430,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); -- 2.32.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] staging: rtl8192u: fix control-message timeouts 2021-10-25 12:09 ` [PATCH 1/2] staging: rtl8192u: " Johan Hovold @ 2021-10-25 15:06 ` Larry Finger 2021-10-25 15:41 ` [cocci] " Joe Perches 0 siblings, 1 reply; 11+ messages in thread From: Larry Finger @ 2021-10-25 15:06 UTC (permalink / raw) To: Johan Hovold, Greg Kroah-Hartman Cc: Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On 10/25/21 07:09, Johan Hovold wrote: > 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 > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) I would have preferred that you not use the magic number "500", but the patch is OK. Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Larry > > diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c > index b6698656fc01..cf5cfee2936f 100644 > --- a/drivers/staging/rtl8192u/r8192U_core.c > +++ b/drivers/staging/rtl8192u/r8192U_core.c > @@ -229,7 +229,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) { > @@ -251,7 +251,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); > > @@ -279,7 +279,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) { > @@ -305,7 +305,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) { > @@ -331,7 +331,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); > > if (status < 0) { > @@ -355,7 +355,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); > > @@ -380,7 +380,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); > > @@ -404,7 +404,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); > > @@ -430,7 +430,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); > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] staging: rtl8192u: fix control-message timeouts 2021-10-25 15:06 ` Larry Finger @ 2021-10-25 15:41 ` Joe Perches 0 siblings, 0 replies; 11+ messages in thread From: Joe Perches @ 2021-10-25 15:41 UTC (permalink / raw) To: Larry Finger, Johan Hovold, Greg Kroah-Hartman, cocci Cc: Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, 2021-10-25 at 10:06 -0500, Larry Finger wrote: > On 10/25/21 07:09, Johan Hovold wrote: > > USB control-message timeouts are specified in milliseconds and should > > specifically not vary with CONFIG_HZ. There appears to be more than a few of these in the kernel. $ cat usb_hz.cocci @@ expression e; @@ * usb_control_msg(..., HZ * e) @@ expression e; @@ * usb_control_msg(..., HZ / e) @@ @@ * usb_control_msg(..., HZ) $ spatch --very-quiet -U 0 -sp-file usb_hz.cocci . warning: line 4: should HZ be a metavariable? warning: line 9: should HZ be a metavariable? warning: line 13: should HZ be a metavariable? 50 files match diff -U 0 -p ./drivers/usb/misc/iowarrior.c /tmp/nothing/drivers/usb/misc/iowarrior.c --- ./drivers/usb/misc/iowarrior.c +++ /tmp/nothing/drivers/usb/misc/iowarrior.c @@ -112,6 +112,0 @@ static int usb_get_report(struct usb_dev - return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - USB_REQ_GET_REPORT, - USB_DIR_IN | USB_TYPE_CLASS | - USB_RECIP_INTERFACE, (type << 8) + id, - inter->desc.bInterfaceNumber, buf, size, - GET_TIMEOUT*HZ); @@ -126,7 +120,0 @@ static int usb_set_report(struct usb_int - return usb_control_msg(interface_to_usbdev(intf), - usb_sndctrlpipe(interface_to_usbdev(intf), 0), - USB_REQ_SET_REPORT, - USB_TYPE_CLASS | USB_RECIP_INTERFACE, - (type << 8) + id, - intf->cur_altsetting->desc.bInterfaceNumber, buf, - size, HZ); diff -U 0 -p ./drivers/staging/rtl8712/usb_ops_linux.c /tmp/nothing/drivers/staging/rtl8712/usb_ops_linux.c --- ./drivers/staging/rtl8712/usb_ops_linux.c +++ /tmp/nothing/drivers/staging/rtl8712/usb_ops_linux.c @@ -496,2 +496,0 @@ int r8712_usbctrl_vendorreq(struct intf_ - status = usb_control_msg(udev, pipe, request, reqtype, value, index, - pIo_buf, len, HZ / 2); diff -U 0 -p ./drivers/staging/rtl8192u/r8192U_core.c /tmp/nothing/drivers/staging/rtl8192u/r8192U_core.c --- ./drivers/staging/rtl8192u/r8192U_core.c +++ /tmp/nothing/drivers/staging/rtl8192u/r8192U_core.c @@ -227,3 +227,0 @@ int write_nic_byte_E(struct net_device * - status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, - indx | 0xfe00, 0, usbdata, 1, HZ / 2); @@ -249,3 +246,0 @@ int read_nic_byte_E(struct net_device *d - status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, - indx | 0xfe00, 0, usbdata, 1, HZ / 2); @@ -276,4 +270,0 @@ int write_nic_byte(struct net_device *de - 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); @@ -302,4 +292,0 @@ int write_nic_word(struct net_device *de - 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); @@ -328,4 +314,0 @@ int write_nic_dword(struct net_device *d - 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); @@ -352,4 +334,0 @@ int read_nic_byte(struct net_device *dev - 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); @@ -377,4 +355,0 @@ int read_nic_word(struct net_device *dev - 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); @@ -402,3 +376,0 @@ static int read_nic_word_E(struct net_de - status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, - indx | 0xfe00, 0, usbdata, 2, HZ / 2); @@ -427,4 +398,0 @@ int read_nic_dword(struct net_device *de - 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); diff -U 0 -p ./drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c /tmp/nothing/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c --- ./drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c +++ /tmp/nothing/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c @@ -28,4 +28,0 @@ 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); @@ -45,4 +41,0 @@ 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); @@ -62,4 +54,0 @@ 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); @@ -79,4 +67,0 @@ 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); @@ -93,4 +77,0 @@ 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); @@ -107,4 +87,0 @@ 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); @@ -183,4 +159,0 @@ 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); diff -U 0 -p ./drivers/net/wireless/ath/ath6kl/usb.c /tmp/nothing/drivers/net/wireless/ath/ath6kl/usb.c --- ./drivers/net/wireless/ath/ath6kl/usb.c +++ /tmp/nothing/drivers/net/wireless/ath/ath6kl/usb.c @@ -905,6 +905,0 @@ static int ath6kl_usb_submit_ctrl_in(str - ret = usb_control_msg(ar_usb->udev, - usb_rcvctrlpipe(ar_usb->udev, 0), - req, - USB_DIR_IN | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, buf, - size, 2 * HZ); diff -U 0 -p ./drivers/net/wireless/ath/ath10k/usb.c /tmp/nothing/drivers/net/wireless/ath/ath10k/usb.c --- ./drivers/net/wireless/ath/ath10k/usb.c +++ /tmp/nothing/drivers/net/wireless/ath/ath10k/usb.c @@ -523,6 +523,0 @@ static int ath10k_usb_submit_ctrl_in(str - ret = usb_control_msg(ar_usb->udev, - usb_rcvctrlpipe(ar_usb->udev, 0), - req, - USB_DIR_IN | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, buf, - size, 2 * HZ); diff -U 0 -p ./drivers/most/most_usb.c /tmp/nothing/drivers/most/most_usb.c --- ./drivers/most/most_usb.c +++ /tmp/nothing/drivers/most/most_usb.c @@ -149,4 +149,0 @@ static inline int drci_rd_reg(struct usb - retval = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - DRCI_READ_REQ, req_type, - 0x0000, - reg, dma_buf, sizeof(*dma_buf), 5 * HZ); @@ -171,9 +167,0 @@ static inline int drci_wr_reg(struct usb - return usb_control_msg(dev, - usb_sndctrlpipe(dev, 0), - DRCI_WRITE_REQ, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - data, - reg, - NULL, - 0, - 5 * HZ); diff -U 0 -p ./drivers/mmc/host/vub300.c /tmp/nothing/drivers/mmc/host/vub300.c --- ./drivers/mmc/host/vub300.c +++ /tmp/nothing/drivers/mmc/host/vub300.c @@ -575,5 +575,0 @@ static void check_vub300_port_status(str - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_SYSTEM_PORT_STATUS, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->system_port_status, - sizeof(vub300->system_port_status), HZ); @@ -1239,6 +1234,0 @@ static void __download_offload_pseudocod - usb_control_msg(vub300->udev, - usb_sndctrlpipe(vub300->udev, 0), - SET_INTERRUPT_PSEUDOCODE, - USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, 0x0000, 0x0000, - xfer_buffer, xfer_length, HZ); @@ -1282,6 +1271,0 @@ static void __download_offload_pseudocod - usb_control_msg(vub300->udev, - usb_sndctrlpipe(vub300->udev, 0), - SET_TRANSFER_PSEUDOCODE, - USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, 0x0000, 0x0000, - xfer_buffer, xfer_length, HZ); @@ -1991,4 +1974,0 @@ static void __set_clock_speed(struct vub - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_CLOCK_SPEED, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x00, 0x00, buf, buf_array_size, HZ); @@ -2013,4 +1992,0 @@ static void vub300_mmc_set_ios(struct mm - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_SD_POWER, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, NULL, 0, HZ); @@ -2020,4 +1995,0 @@ static void vub300_mmc_set_ios(struct mm - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_SD_POWER, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0001, 0x0000, NULL, 0, HZ); @@ -2274,5 +2245,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_HC_INF0, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->hc_info, - sizeof(vub300->hc_info), HZ); @@ -2282,4 +2248,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_ROM_WAIT_STATES, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - firmware_rom_wait_states, 0x0000, NULL, 0, HZ); @@ -2296,5 +2258,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_SYSTEM_PORT_STATUS, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->system_port_status, - sizeof(vub300->system_port_status), HZ); diff -U 0 -p ./drivers/media/usb/stk1160/stk1160-core.c /tmp/nothing/drivers/media/usb/stk1160/stk1160-core.c --- ./drivers/media/usb/stk1160/stk1160-core.c +++ /tmp/nothing/drivers/media/usb/stk1160/stk1160-core.c @@ -66,3 +66,0 @@ int stk1160_read_reg(struct stk1160 *dev - ret = usb_control_msg(dev->udev, pipe, 0x00, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x00, reg, buf, sizeof(u8), HZ); @@ -86,3 +83,0 @@ int stk1160_write_reg(struct stk1160 *de - ret = usb_control_msg(dev->udev, pipe, 0x01, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - value, reg, NULL, 0, HZ); diff -U 0 -p ./drivers/media/usb/s2255/s2255drv.c /tmp/nothing/drivers/media/usb/s2255/s2255drv.c --- ./drivers/media/usb/s2255/s2255drv.c +++ /tmp/nothing/drivers/media/usb/s2255/s2255drv.c @@ -1880,6 +1880,0 @@ static long s2255_vendor_req(struct s225 - r = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), - Request, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | - USB_DIR_IN, - Value, Index, buf, - TransferBufferLength, HZ * 5); @@ -1891,4 +1885,0 @@ static long s2255_vendor_req(struct s225 - r = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), - Request, USB_TYPE_VENDOR | USB_RECIP_DEVICE, - Value, Index, buf, - TransferBufferLength, HZ * 5); diff -U 0 -p ./drivers/media/usb/pvrusb2/pvrusb2-hdw.c /tmp/nothing/drivers/media/usb/pvrusb2/pvrusb2-hdw.c --- ./drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ /tmp/nothing/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -1469,2 +1469,0 @@ static int pvr2_upload_firmware1(struct - ret += usb_control_msg(hdw->usb_dev, pipe, 0xa0, 0x40, address, - 0, fw_ptr, 0x800, HZ); @@ -3437,5 +3435,0 @@ void pvr2_hdw_cpufw_set_enabled(struct p - ret = usb_control_msg(hdw->usb_dev,pipe, - 0xa0,0xc0, - address,0, - hdw->fw_buffer+address, - 0x800,HZ); @@ -3980 +3973,0 @@ void pvr2_hdw_cpureset_assert(struct pvr - ret = usb_control_msg(hdw->usb_dev,pipe,0xa0,0x40,0xe600,0,da,1,HZ); diff -U 0 -p ./drivers/media/usb/em28xx/em28xx-core.c /tmp/nothing/drivers/media/usb/em28xx/em28xx-core.c --- ./drivers/media/usb/em28xx/em28xx-core.c +++ /tmp/nothing/drivers/media/usb/em28xx/em28xx-core.c @@ -90,3 +90,0 @@ int em28xx_read_reg_req_len(struct em28x - ret = usb_control_msg(udev, pipe, req, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); @@ -159,3 +156,0 @@ int em28xx_write_regs_req(struct em28xx - ret = usb_control_msg(udev, pipe, req, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); diff -U 0 -p ./drivers/media/usb/cpia2/cpia2_usb.c /tmp/nothing/drivers/media/usb/cpia2/cpia2_usb.c --- ./drivers/media/usb/cpia2/cpia2_usb.c +++ /tmp/nothing/drivers/media/usb/cpia2/cpia2_usb.c @@ -545,9 +545,0 @@ static int write_packet(struct usb_devic - ret = usb_control_msg(udev, - usb_sndctrlpipe(udev, 0), - request, - USB_TYPE_VENDOR | USB_RECIP_DEVICE, - start, /* value */ - 0, /* index */ - buf, /* buffer */ - size, - HZ); @@ -577,9 +568,0 @@ static int read_packet(struct usb_device - ret = usb_control_msg(udev, - usb_rcvctrlpipe(udev, 0), - request, - USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_DEVICE, - start, /* value */ - 0, /* index */ - buf, /* buffer */ - size, - HZ); diff -U 0 -p ./drivers/media/usb/b2c2/flexcop-usb.c /tmp/nothing/drivers/media/usb/b2c2/flexcop-usb.c --- ./drivers/media/usb/b2c2/flexcop-usb.c +++ /tmp/nothing/drivers/media/usb/b2c2/flexcop-usb.c @@ -82,9 +82,0 @@ static int flexcop_usb_readwrite_dw(stru - ret = usb_control_msg(fc_usb->udev, - read ? B2C2_USB_CTRL_PIPE_IN : B2C2_USB_CTRL_PIPE_OUT, - request, - request_type, /* 0xc0 read or 0x40 write */ - wAddress, - 0, - fc_usb->data, - sizeof(u32), - B2C2_WAIT_FOR_OPERATION_RDW * HZ); @@ -151,8 +142,0 @@ static int flexcop_usb_v8_memory_req(str - ret = usb_control_msg(fc_usb->udev, pipe, - req, - request_type, - wAddress, - wIndex, - fc_usb->data, - buflen, - nWaitTime * HZ); @@ -277,8 +260,0 @@ static int flexcop_usb_i2c_req(struct fl - ret = usb_control_msg(fc_usb->udev, pipe, - req, - request_type, - wValue, - wIndex, - fc_usb->data, - buflen, - nWaitTime * HZ); diff -U 0 -p ./drivers/media/rc/redrat3.c /tmp/nothing/drivers/media/rc/redrat3.c --- ./drivers/media/rc/redrat3.c +++ /tmp/nothing/drivers/media/rc/redrat3.c @@ -405,3 +405,0 @@ static int redrat3_send_cmd(int cmd, str - res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), cmd, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0x0000, 0x0000, data, sizeof(u8), HZ * 10); @@ -481,3 +478,0 @@ static u32 redrat3_get_timeout(struct re - ret = usb_control_msg(rr3->udev, pipe, RR3_GET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - RR3_IR_IO_SIG_TIMEOUT, 0, tmp, len, HZ * 5); @@ -510,4 +504,0 @@ static int redrat3_set_timeout(struct rc - ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_SIG_TIMEOUT, 0, timeout, sizeof(*timeout), - HZ * 25); @@ -543,3 +533,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, rxpipe, RR3_RESET, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - RR3_CPUCS_REG_ADDR, 0, val, len, HZ * 25); @@ -549,3 +536,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_LENGTH_FUZZ, 0, val, len, HZ * 25); @@ -555,3 +539,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_MIN_PAUSE, 0, val, len, HZ * 25); @@ -561,3 +542,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_PERIODS_MF, 0, val, len, HZ * 25); @@ -568,3 +546,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_MAX_LENGTHS, 0, val, len, HZ * 25); @@ -585,4 +560,0 @@ static void redrat3_get_firmware_rev(str - rc = usb_control_msg(rr3->udev, usb_rcvctrlpipe(rr3->udev, 0), - RR3_FW_VERSION, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0, 0, buffer, RR3_FW_VERSION_LEN, HZ * 5); @@ -833,3 +804,0 @@ static int redrat3_transmit_ir(struct rc - ret = usb_control_msg(rr3->udev, pipe, RR3_TX_SEND_SIGNAL, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0, 0, irdata, 2, HZ * 10); diff -U 0 -p ./drivers/media/rc/mceusb.c /tmp/nothing/drivers/media/rc/mceusb.c --- ./drivers/media/rc/mceusb.c +++ /tmp/nothing/drivers/media/rc/mceusb.c @@ -1431,3 +1431,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0), - USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0, - data, USB_CTRL_MSG_SZ, HZ * 3); @@ -1439,3 +1436,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - USB_REQ_SET_FEATURE, USB_TYPE_VENDOR, - 0xc04e, 0x0000, NULL, 0, HZ * 3); @@ -1446,3 +1440,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - 4, USB_TYPE_VENDOR, - 0x0808, 0x0000, NULL, 0, HZ * 3); @@ -1452,3 +1443,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - 2, USB_TYPE_VENDOR, - 0x0000, 0x0100, NULL, 0, HZ * 3); diff -U 0 -p ./drivers/input/joystick/iforce/iforce-usb.c /tmp/nothing/drivers/input/joystick/iforce/iforce-usb.c --- ./drivers/input/joystick/iforce/iforce-usb.c +++ /tmp/nothing/drivers/input/joystick/iforce/iforce-usb.c @@ -90,6 +90,0 @@ static int iforce_usb_get_id(struct ifor - status = usb_control_msg(iforce_usb->usbdev, - usb_rcvctrlpipe(iforce_usb->usbdev, 0), - id, - USB_TYPE_VENDOR | USB_DIR_IN | - USB_RECIP_INTERFACE, - 0, 0, buf, IFORCE_MAX_LENGTH, HZ); diff -U 0 -p ./drivers/gpu/drm/udl/udl_connector.c /tmp/nothing/drivers/gpu/drm/udl/udl_connector.c --- ./drivers/gpu/drm/udl/udl_connector.c +++ /tmp/nothing/drivers/gpu/drm/udl/udl_connector.c @@ -31,3 +31,0 @@ static int udl_get_edid_block(void *data - ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x02, (0x80 | (0x02 << 5)), bval, - 0xA1, read_buff, 2, HZ); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [cocci] [PATCH 1/2] staging: rtl8192u: fix control-message timeouts @ 2021-10-25 15:41 ` Joe Perches 0 siblings, 0 replies; 11+ messages in thread From: Joe Perches @ 2021-10-25 15:41 UTC (permalink / raw) To: Larry Finger, Johan Hovold, Greg Kroah-Hartman, cocci Cc: Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, 2021-10-25 at 10:06 -0500, Larry Finger wrote: > On 10/25/21 07:09, Johan Hovold wrote: > > USB control-message timeouts are specified in milliseconds and should > > specifically not vary with CONFIG_HZ. There appears to be more than a few of these in the kernel. $ cat usb_hz.cocci @@ expression e; @@ * usb_control_msg(..., HZ * e) @@ expression e; @@ * usb_control_msg(..., HZ / e) @@ @@ * usb_control_msg(..., HZ) $ spatch --very-quiet -U 0 -sp-file usb_hz.cocci . warning: line 4: should HZ be a metavariable? warning: line 9: should HZ be a metavariable? warning: line 13: should HZ be a metavariable? 50 files match diff -U 0 -p ./drivers/usb/misc/iowarrior.c /tmp/nothing/drivers/usb/misc/iowarrior.c --- ./drivers/usb/misc/iowarrior.c +++ /tmp/nothing/drivers/usb/misc/iowarrior.c @@ -112,6 +112,0 @@ static int usb_get_report(struct usb_dev - return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - USB_REQ_GET_REPORT, - USB_DIR_IN | USB_TYPE_CLASS | - USB_RECIP_INTERFACE, (type << 8) + id, - inter->desc.bInterfaceNumber, buf, size, - GET_TIMEOUT*HZ); @@ -126,7 +120,0 @@ static int usb_set_report(struct usb_int - return usb_control_msg(interface_to_usbdev(intf), - usb_sndctrlpipe(interface_to_usbdev(intf), 0), - USB_REQ_SET_REPORT, - USB_TYPE_CLASS | USB_RECIP_INTERFACE, - (type << 8) + id, - intf->cur_altsetting->desc.bInterfaceNumber, buf, - size, HZ); diff -U 0 -p ./drivers/staging/rtl8712/usb_ops_linux.c /tmp/nothing/drivers/staging/rtl8712/usb_ops_linux.c --- ./drivers/staging/rtl8712/usb_ops_linux.c +++ /tmp/nothing/drivers/staging/rtl8712/usb_ops_linux.c @@ -496,2 +496,0 @@ int r8712_usbctrl_vendorreq(struct intf_ - status = usb_control_msg(udev, pipe, request, reqtype, value, index, - pIo_buf, len, HZ / 2); diff -U 0 -p ./drivers/staging/rtl8192u/r8192U_core.c /tmp/nothing/drivers/staging/rtl8192u/r8192U_core.c --- ./drivers/staging/rtl8192u/r8192U_core.c +++ /tmp/nothing/drivers/staging/rtl8192u/r8192U_core.c @@ -227,3 +227,0 @@ int write_nic_byte_E(struct net_device * - status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, - indx | 0xfe00, 0, usbdata, 1, HZ / 2); @@ -249,3 +246,0 @@ int read_nic_byte_E(struct net_device *d - status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, - indx | 0xfe00, 0, usbdata, 1, HZ / 2); @@ -276,4 +270,0 @@ int write_nic_byte(struct net_device *de - 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); @@ -302,4 +292,0 @@ int write_nic_word(struct net_device *de - 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); @@ -328,4 +314,0 @@ int write_nic_dword(struct net_device *d - 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); @@ -352,4 +334,0 @@ int read_nic_byte(struct net_device *dev - 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); @@ -377,4 +355,0 @@ int read_nic_word(struct net_device *dev - 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); @@ -402,3 +376,0 @@ static int read_nic_word_E(struct net_de - status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, - indx | 0xfe00, 0, usbdata, 2, HZ / 2); @@ -427,4 +398,0 @@ int read_nic_dword(struct net_device *de - 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); diff -U 0 -p ./drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c /tmp/nothing/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c --- ./drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c +++ /tmp/nothing/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c @@ -28,4 +28,0 @@ 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); @@ -45,4 +41,0 @@ 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); @@ -62,4 +54,0 @@ 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); @@ -79,4 +67,0 @@ 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); @@ -93,4 +77,0 @@ 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); @@ -107,4 +87,0 @@ 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); @@ -183,4 +159,0 @@ 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); diff -U 0 -p ./drivers/net/wireless/ath/ath6kl/usb.c /tmp/nothing/drivers/net/wireless/ath/ath6kl/usb.c --- ./drivers/net/wireless/ath/ath6kl/usb.c +++ /tmp/nothing/drivers/net/wireless/ath/ath6kl/usb.c @@ -905,6 +905,0 @@ static int ath6kl_usb_submit_ctrl_in(str - ret = usb_control_msg(ar_usb->udev, - usb_rcvctrlpipe(ar_usb->udev, 0), - req, - USB_DIR_IN | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, buf, - size, 2 * HZ); diff -U 0 -p ./drivers/net/wireless/ath/ath10k/usb.c /tmp/nothing/drivers/net/wireless/ath/ath10k/usb.c --- ./drivers/net/wireless/ath/ath10k/usb.c +++ /tmp/nothing/drivers/net/wireless/ath/ath10k/usb.c @@ -523,6 +523,0 @@ static int ath10k_usb_submit_ctrl_in(str - ret = usb_control_msg(ar_usb->udev, - usb_rcvctrlpipe(ar_usb->udev, 0), - req, - USB_DIR_IN | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, value, index, buf, - size, 2 * HZ); diff -U 0 -p ./drivers/most/most_usb.c /tmp/nothing/drivers/most/most_usb.c --- ./drivers/most/most_usb.c +++ /tmp/nothing/drivers/most/most_usb.c @@ -149,4 +149,0 @@ static inline int drci_rd_reg(struct usb - retval = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - DRCI_READ_REQ, req_type, - 0x0000, - reg, dma_buf, sizeof(*dma_buf), 5 * HZ); @@ -171,9 +167,0 @@ static inline int drci_wr_reg(struct usb - return usb_control_msg(dev, - usb_sndctrlpipe(dev, 0), - DRCI_WRITE_REQ, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - data, - reg, - NULL, - 0, - 5 * HZ); diff -U 0 -p ./drivers/mmc/host/vub300.c /tmp/nothing/drivers/mmc/host/vub300.c --- ./drivers/mmc/host/vub300.c +++ /tmp/nothing/drivers/mmc/host/vub300.c @@ -575,5 +575,0 @@ static void check_vub300_port_status(str - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_SYSTEM_PORT_STATUS, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->system_port_status, - sizeof(vub300->system_port_status), HZ); @@ -1239,6 +1234,0 @@ static void __download_offload_pseudocod - usb_control_msg(vub300->udev, - usb_sndctrlpipe(vub300->udev, 0), - SET_INTERRUPT_PSEUDOCODE, - USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, 0x0000, 0x0000, - xfer_buffer, xfer_length, HZ); @@ -1282,6 +1271,0 @@ static void __download_offload_pseudocod - usb_control_msg(vub300->udev, - usb_sndctrlpipe(vub300->udev, 0), - SET_TRANSFER_PSEUDOCODE, - USB_DIR_OUT | USB_TYPE_VENDOR | - USB_RECIP_DEVICE, 0x0000, 0x0000, - xfer_buffer, xfer_length, HZ); @@ -1991,4 +1974,0 @@ static void __set_clock_speed(struct vub - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_CLOCK_SPEED, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x00, 0x00, buf, buf_array_size, HZ); @@ -2013,4 +1992,0 @@ static void vub300_mmc_set_ios(struct mm - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_SD_POWER, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, NULL, 0, HZ); @@ -2020,4 +1995,0 @@ static void vub300_mmc_set_ios(struct mm - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_SD_POWER, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0001, 0x0000, NULL, 0, HZ); @@ -2274,5 +2245,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_HC_INF0, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->hc_info, - sizeof(vub300->hc_info), HZ); @@ -2282,4 +2248,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_sndctrlpipe(vub300->udev, 0), - SET_ROM_WAIT_STATES, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - firmware_rom_wait_states, 0x0000, NULL, 0, HZ); @@ -2296,5 +2258,0 @@ static int vub300_probe(struct usb_inter - usb_control_msg(vub300->udev, usb_rcvctrlpipe(vub300->udev, 0), - GET_SYSTEM_PORT_STATUS, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, 0x0000, &vub300->system_port_status, - sizeof(vub300->system_port_status), HZ); diff -U 0 -p ./drivers/media/usb/stk1160/stk1160-core.c /tmp/nothing/drivers/media/usb/stk1160/stk1160-core.c --- ./drivers/media/usb/stk1160/stk1160-core.c +++ /tmp/nothing/drivers/media/usb/stk1160/stk1160-core.c @@ -66,3 +66,0 @@ int stk1160_read_reg(struct stk1160 *dev - ret = usb_control_msg(dev->udev, pipe, 0x00, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x00, reg, buf, sizeof(u8), HZ); @@ -86,3 +83,0 @@ int stk1160_write_reg(struct stk1160 *de - ret = usb_control_msg(dev->udev, pipe, 0x01, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - value, reg, NULL, 0, HZ); diff -U 0 -p ./drivers/media/usb/s2255/s2255drv.c /tmp/nothing/drivers/media/usb/s2255/s2255drv.c --- ./drivers/media/usb/s2255/s2255drv.c +++ /tmp/nothing/drivers/media/usb/s2255/s2255drv.c @@ -1880,6 +1880,0 @@ static long s2255_vendor_req(struct s225 - r = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), - Request, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | - USB_DIR_IN, - Value, Index, buf, - TransferBufferLength, HZ * 5); @@ -1891,4 +1885,0 @@ static long s2255_vendor_req(struct s225 - r = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), - Request, USB_TYPE_VENDOR | USB_RECIP_DEVICE, - Value, Index, buf, - TransferBufferLength, HZ * 5); diff -U 0 -p ./drivers/media/usb/pvrusb2/pvrusb2-hdw.c /tmp/nothing/drivers/media/usb/pvrusb2/pvrusb2-hdw.c --- ./drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ /tmp/nothing/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -1469,2 +1469,0 @@ static int pvr2_upload_firmware1(struct - ret += usb_control_msg(hdw->usb_dev, pipe, 0xa0, 0x40, address, - 0, fw_ptr, 0x800, HZ); @@ -3437,5 +3435,0 @@ void pvr2_hdw_cpufw_set_enabled(struct p - ret = usb_control_msg(hdw->usb_dev,pipe, - 0xa0,0xc0, - address,0, - hdw->fw_buffer+address, - 0x800,HZ); @@ -3980 +3973,0 @@ void pvr2_hdw_cpureset_assert(struct pvr - ret = usb_control_msg(hdw->usb_dev,pipe,0xa0,0x40,0xe600,0,da,1,HZ); diff -U 0 -p ./drivers/media/usb/em28xx/em28xx-core.c /tmp/nothing/drivers/media/usb/em28xx/em28xx-core.c --- ./drivers/media/usb/em28xx/em28xx-core.c +++ /tmp/nothing/drivers/media/usb/em28xx/em28xx-core.c @@ -90,3 +90,0 @@ int em28xx_read_reg_req_len(struct em28x - ret = usb_control_msg(udev, pipe, req, - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); @@ -159,3 +156,0 @@ int em28xx_write_regs_req(struct em28xx - ret = usb_control_msg(udev, pipe, req, - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0x0000, reg, dev->urb_buf, len, HZ); diff -U 0 -p ./drivers/media/usb/cpia2/cpia2_usb.c /tmp/nothing/drivers/media/usb/cpia2/cpia2_usb.c --- ./drivers/media/usb/cpia2/cpia2_usb.c +++ /tmp/nothing/drivers/media/usb/cpia2/cpia2_usb.c @@ -545,9 +545,0 @@ static int write_packet(struct usb_devic - ret = usb_control_msg(udev, - usb_sndctrlpipe(udev, 0), - request, - USB_TYPE_VENDOR | USB_RECIP_DEVICE, - start, /* value */ - 0, /* index */ - buf, /* buffer */ - size, - HZ); @@ -577,9 +568,0 @@ static int read_packet(struct usb_device - ret = usb_control_msg(udev, - usb_rcvctrlpipe(udev, 0), - request, - USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_DEVICE, - start, /* value */ - 0, /* index */ - buf, /* buffer */ - size, - HZ); diff -U 0 -p ./drivers/media/usb/b2c2/flexcop-usb.c /tmp/nothing/drivers/media/usb/b2c2/flexcop-usb.c --- ./drivers/media/usb/b2c2/flexcop-usb.c +++ /tmp/nothing/drivers/media/usb/b2c2/flexcop-usb.c @@ -82,9 +82,0 @@ static int flexcop_usb_readwrite_dw(stru - ret = usb_control_msg(fc_usb->udev, - read ? B2C2_USB_CTRL_PIPE_IN : B2C2_USB_CTRL_PIPE_OUT, - request, - request_type, /* 0xc0 read or 0x40 write */ - wAddress, - 0, - fc_usb->data, - sizeof(u32), - B2C2_WAIT_FOR_OPERATION_RDW * HZ); @@ -151,8 +142,0 @@ static int flexcop_usb_v8_memory_req(str - ret = usb_control_msg(fc_usb->udev, pipe, - req, - request_type, - wAddress, - wIndex, - fc_usb->data, - buflen, - nWaitTime * HZ); @@ -277,8 +260,0 @@ static int flexcop_usb_i2c_req(struct fl - ret = usb_control_msg(fc_usb->udev, pipe, - req, - request_type, - wValue, - wIndex, - fc_usb->data, - buflen, - nWaitTime * HZ); diff -U 0 -p ./drivers/media/rc/redrat3.c /tmp/nothing/drivers/media/rc/redrat3.c --- ./drivers/media/rc/redrat3.c +++ /tmp/nothing/drivers/media/rc/redrat3.c @@ -405,3 +405,0 @@ static int redrat3_send_cmd(int cmd, str - res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), cmd, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0x0000, 0x0000, data, sizeof(u8), HZ * 10); @@ -481,3 +478,0 @@ static u32 redrat3_get_timeout(struct re - ret = usb_control_msg(rr3->udev, pipe, RR3_GET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - RR3_IR_IO_SIG_TIMEOUT, 0, tmp, len, HZ * 5); @@ -510,4 +504,0 @@ static int redrat3_set_timeout(struct rc - ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_SIG_TIMEOUT, 0, timeout, sizeof(*timeout), - HZ * 25); @@ -543,3 +533,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, rxpipe, RR3_RESET, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - RR3_CPUCS_REG_ADDR, 0, val, len, HZ * 25); @@ -549,3 +536,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_LENGTH_FUZZ, 0, val, len, HZ * 25); @@ -555,3 +539,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_MIN_PAUSE, 0, val, len, HZ * 25); @@ -561,3 +542,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_PERIODS_MF, 0, val, len, HZ * 25); @@ -568,3 +546,0 @@ static void redrat3_reset(struct redrat3 - rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, - RR3_IR_IO_MAX_LENGTHS, 0, val, len, HZ * 25); @@ -585,4 +560,0 @@ static void redrat3_get_firmware_rev(str - rc = usb_control_msg(rr3->udev, usb_rcvctrlpipe(rr3->udev, 0), - RR3_FW_VERSION, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0, 0, buffer, RR3_FW_VERSION_LEN, HZ * 5); @@ -833,3 +804,0 @@ static int redrat3_transmit_ir(struct rc - ret = usb_control_msg(rr3->udev, pipe, RR3_TX_SEND_SIGNAL, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, - 0, 0, irdata, 2, HZ * 10); diff -U 0 -p ./drivers/media/rc/mceusb.c /tmp/nothing/drivers/media/rc/mceusb.c --- ./drivers/media/rc/mceusb.c +++ /tmp/nothing/drivers/media/rc/mceusb.c @@ -1431,3 +1431,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0), - USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0, - data, USB_CTRL_MSG_SZ, HZ * 3); @@ -1439,3 +1436,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - USB_REQ_SET_FEATURE, USB_TYPE_VENDOR, - 0xc04e, 0x0000, NULL, 0, HZ * 3); @@ -1446,3 +1440,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - 4, USB_TYPE_VENDOR, - 0x0808, 0x0000, NULL, 0, HZ * 3); @@ -1452,3 +1443,0 @@ static void mceusb_gen1_init(struct mceu - ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0), - 2, USB_TYPE_VENDOR, - 0x0000, 0x0100, NULL, 0, HZ * 3); diff -U 0 -p ./drivers/input/joystick/iforce/iforce-usb.c /tmp/nothing/drivers/input/joystick/iforce/iforce-usb.c --- ./drivers/input/joystick/iforce/iforce-usb.c +++ /tmp/nothing/drivers/input/joystick/iforce/iforce-usb.c @@ -90,6 +90,0 @@ static int iforce_usb_get_id(struct ifor - status = usb_control_msg(iforce_usb->usbdev, - usb_rcvctrlpipe(iforce_usb->usbdev, 0), - id, - USB_TYPE_VENDOR | USB_DIR_IN | - USB_RECIP_INTERFACE, - 0, 0, buf, IFORCE_MAX_LENGTH, HZ); diff -U 0 -p ./drivers/gpu/drm/udl/udl_connector.c /tmp/nothing/drivers/gpu/drm/udl/udl_connector.c --- ./drivers/gpu/drm/udl/udl_connector.c +++ /tmp/nothing/drivers/gpu/drm/udl/udl_connector.c @@ -31,3 +31,0 @@ static int udl_get_edid_block(void *data - ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x02, (0x80 | (0x02 << 5)), bval, - 0xA1, read_buff, 2, HZ); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] staging: rtl8192u: fix control-message timeouts 2021-10-25 15:41 ` [cocci] " Joe Perches @ 2021-10-25 15:51 ` Greg Kroah-Hartman -1 siblings, 0 replies; 11+ messages in thread From: Greg Kroah-Hartman @ 2021-10-25 15:51 UTC (permalink / raw) To: Joe Perches Cc: Larry Finger, Johan Hovold, cocci, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, Oct 25, 2021 at 08:41:36AM -0700, Joe Perches wrote: > On Mon, 2021-10-25 at 10:06 -0500, Larry Finger wrote: > > On 10/25/21 07:09, Johan Hovold wrote: > > > USB control-message timeouts are specified in milliseconds and should > > > specifically not vary with CONFIG_HZ. > > There appears to be more than a few of these in the kernel. > > $ cat usb_hz.cocci > @@ > expression e; > @@ > * usb_control_msg(..., HZ * e) > > @@ > expression e; > @@ > * usb_control_msg(..., HZ / e) > > @@ > @@ > * usb_control_msg(..., HZ) > > $ spatch --very-quiet -U 0 -sp-file usb_hz.cocci . > warning: line 4: should HZ be a metavariable? > warning: line 9: should HZ be a metavariable? > warning: line 13: should HZ be a metavariable? > 50 files match Look at the lists, he's sent a bunch of fixes for this today to all the subsystems... greg k-h ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [cocci] [PATCH 1/2] staging: rtl8192u: fix control-message timeouts @ 2021-10-25 15:51 ` Greg Kroah-Hartman 0 siblings, 0 replies; 11+ messages in thread From: Greg Kroah-Hartman @ 2021-10-25 15:51 UTC (permalink / raw) To: Joe Perches Cc: Larry Finger, Johan Hovold, cocci, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, Oct 25, 2021 at 08:41:36AM -0700, Joe Perches wrote: > On Mon, 2021-10-25 at 10:06 -0500, Larry Finger wrote: > > On 10/25/21 07:09, Johan Hovold wrote: > > > USB control-message timeouts are specified in milliseconds and should > > > specifically not vary with CONFIG_HZ. > > There appears to be more than a few of these in the kernel. > > $ cat usb_hz.cocci > @@ > expression e; > @@ > * usb_control_msg(..., HZ * e) > > @@ > expression e; > @@ > * usb_control_msg(..., HZ / e) > > @@ > @@ > * usb_control_msg(..., HZ) > > $ spatch --very-quiet -U 0 -sp-file usb_hz.cocci . > warning: line 4: should HZ be a metavariable? > warning: line 9: should HZ be a metavariable? > warning: line 13: should HZ be a metavariable? > 50 files match Look at the lists, he's sent a bunch of fixes for this today to all the subsystems... greg k-h ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] staging: rtl8192u: fix control-message timeouts 2021-10-25 15:51 ` [cocci] " Greg Kroah-Hartman @ 2021-10-25 16:20 ` Joe Perches -1 siblings, 0 replies; 11+ messages in thread From: Joe Perches @ 2021-10-25 16:20 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Larry Finger, Johan Hovold, cocci, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, 2021-10-25 at 17:51 +0200, Greg Kroah-Hartman wrote: > Look at the lists, he's sent a bunch of fixes for this today to all the > subsystems... Yay Johan. Thanks for doing all of them... ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [cocci] [PATCH 1/2] staging: rtl8192u: fix control-message timeouts @ 2021-10-25 16:20 ` Joe Perches 0 siblings, 0 replies; 11+ messages in thread From: Joe Perches @ 2021-10-25 16:20 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Larry Finger, Johan Hovold, cocci, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On Mon, 2021-10-25 at 17:51 +0200, Greg Kroah-Hartman wrote: > Look at the lists, he's sent a bunch of fixes for this today to all the > subsystems... Yay Johan. Thanks for doing all of them... ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] staging: r8712u: fix control-message timeout 2021-10-25 12:09 [PATCH 0/2] staging: fix control-message timeouts Johan Hovold 2021-10-25 12:09 ` [PATCH 1/2] staging: rtl8192u: " Johan Hovold @ 2021-10-25 12:09 ` Johan Hovold 2021-10-25 15:08 ` Larry Finger 1 sibling, 1 reply; 11+ messages in thread From: Johan Hovold @ 2021-10-25 12:09 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Larry Finger, Florian Schilhabel, linux-staging, linux-usb, linux-kernel, Johan Hovold, stable USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel") Cc: stable@vger.kernel.org # 2.6.37 Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/staging/rtl8712/usb_ops_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index 655497cead12..f984a5ab2c6f 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -494,7 +494,7 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, memcpy(pIo_buf, pdata, len); } status = usb_control_msg(udev, pipe, request, reqtype, value, index, - pIo_buf, len, HZ / 2); + pIo_buf, len, 500); if (status > 0) { /* Success this control transfer. */ if (requesttype == 0x01) { /* For Control read transfer, we have to copy the read -- 2.32.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: r8712u: fix control-message timeout 2021-10-25 12:09 ` [PATCH 2/2] staging: r8712u: fix control-message timeout Johan Hovold @ 2021-10-25 15:08 ` Larry Finger 0 siblings, 0 replies; 11+ messages in thread From: Larry Finger @ 2021-10-25 15:08 UTC (permalink / raw) To: Johan Hovold, Greg Kroah-Hartman Cc: Florian Schilhabel, linux-staging, linux-usb, linux-kernel, stable On 10/25/21 07:09, Johan Hovold wrote: > USB control-message timeouts are specified in milliseconds and should > specifically not vary with CONFIG_HZ. > > Fixes: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel") > Cc: stable@vger.kernel.org # 2.6.37 > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > drivers/staging/rtl8712/usb_ops_linux.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Larry Finger <Larry.Finger@lwfinger.net> > > diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c > index 655497cead12..f984a5ab2c6f 100644 > --- a/drivers/staging/rtl8712/usb_ops_linux.c > +++ b/drivers/staging/rtl8712/usb_ops_linux.c > @@ -494,7 +494,7 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value, > memcpy(pIo_buf, pdata, len); > } > status = usb_control_msg(udev, pipe, request, reqtype, value, index, > - pIo_buf, len, HZ / 2); > + pIo_buf, len, 500); > if (status > 0) { /* Success this control transfer. */ > if (requesttype == 0x01) { > /* For Control read transfer, we have to copy the read > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-10-25 23:28 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-25 12:09 [PATCH 0/2] staging: fix control-message timeouts Johan Hovold 2021-10-25 12:09 ` [PATCH 1/2] staging: rtl8192u: " Johan Hovold 2021-10-25 15:06 ` Larry Finger 2021-10-25 15:41 ` Joe Perches 2021-10-25 15:41 ` [cocci] " Joe Perches 2021-10-25 15:51 ` Greg Kroah-Hartman 2021-10-25 15:51 ` [cocci] " Greg Kroah-Hartman 2021-10-25 16:20 ` Joe Perches 2021-10-25 16:20 ` [cocci] " Joe Perches 2021-10-25 12:09 ` [PATCH 2/2] staging: r8712u: fix control-message timeout Johan Hovold 2021-10-25 15:08 ` Larry Finger
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.