mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
comedi: vmk80xx: fix bulk and interrupt message timeouts
commita56d3e40bd
upstream. USB bulk and interrupt message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Note that the bulk-out transfer timeout was set to the endpoint bInterval value, which should be ignored for bulk endpoints and is typically set to zero. This meant that a failing bulk-out transfer would never time out. Assume that the 10 second timeout used for all other transfers is more than enough also for the bulk-out endpoint. Fixes:985cafccbf
("Staging: Comedi: vmk80xx: Add k8061 support") Fixes:951348b377
("staging: comedi: vmk80xx: wait for URBs to complete") Cc: stable@vger.kernel.org # 2.6.31 Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20211025114532.4599-6-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1ae4715121
commit
88a252ff78
1 changed files with 7 additions and 5 deletions
|
@ -91,6 +91,7 @@ enum {
|
|||
#define IC6_VERSION BIT(1)
|
||||
|
||||
#define MIN_BUF_SIZE 64
|
||||
#define PACKET_TIMEOUT 10000 /* ms */
|
||||
|
||||
enum vmk80xx_model {
|
||||
VMK8055_MODEL,
|
||||
|
@ -169,10 +170,11 @@ static void vmk80xx_do_bulk_msg(struct comedi_device *dev)
|
|||
tx_size = usb_endpoint_maxp(devpriv->ep_tx);
|
||||
rx_size = usb_endpoint_maxp(devpriv->ep_rx);
|
||||
|
||||
usb_bulk_msg(usb, tx_pipe, devpriv->usb_tx_buf,
|
||||
tx_size, NULL, devpriv->ep_tx->bInterval);
|
||||
usb_bulk_msg(usb, tx_pipe, devpriv->usb_tx_buf, tx_size, NULL,
|
||||
PACKET_TIMEOUT);
|
||||
|
||||
usb_bulk_msg(usb, rx_pipe, devpriv->usb_rx_buf, rx_size, NULL, HZ * 10);
|
||||
usb_bulk_msg(usb, rx_pipe, devpriv->usb_rx_buf, rx_size, NULL,
|
||||
PACKET_TIMEOUT);
|
||||
}
|
||||
|
||||
static int vmk80xx_read_packet(struct comedi_device *dev)
|
||||
|
@ -191,7 +193,7 @@ static int vmk80xx_read_packet(struct comedi_device *dev)
|
|||
pipe = usb_rcvintpipe(usb, ep->bEndpointAddress);
|
||||
return usb_interrupt_msg(usb, pipe, devpriv->usb_rx_buf,
|
||||
usb_endpoint_maxp(ep), NULL,
|
||||
HZ * 10);
|
||||
PACKET_TIMEOUT);
|
||||
}
|
||||
|
||||
static int vmk80xx_write_packet(struct comedi_device *dev, int cmd)
|
||||
|
@ -212,7 +214,7 @@ static int vmk80xx_write_packet(struct comedi_device *dev, int cmd)
|
|||
pipe = usb_sndintpipe(usb, ep->bEndpointAddress);
|
||||
return usb_interrupt_msg(usb, pipe, devpriv->usb_tx_buf,
|
||||
usb_endpoint_maxp(ep), NULL,
|
||||
HZ * 10);
|
||||
PACKET_TIMEOUT);
|
||||
}
|
||||
|
||||
static int vmk80xx_reset_device(struct comedi_device *dev)
|
||||
|
|
Loading…
Reference in a new issue