|
@@ -177,7 +177,7 @@ static void vmk80xx_do_bulk_msg(struct comedi_device *dev)
|
|
|
* The max packet size attributes of the K8061
|
|
|
* input/output endpoints are identical
|
|
|
*/
|
|
|
- size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize);
|
|
|
+ size = usb_endpoint_maxp(devpriv->ep_tx);
|
|
|
|
|
|
usb_bulk_msg(usb, tx_pipe, devpriv->usb_tx_buf,
|
|
|
size, NULL, devpriv->ep_tx->bInterval);
|
|
@@ -199,7 +199,7 @@ static int vmk80xx_read_packet(struct comedi_device *dev)
|
|
|
ep = devpriv->ep_rx;
|
|
|
pipe = usb_rcvintpipe(usb, ep->bEndpointAddress);
|
|
|
return usb_interrupt_msg(usb, pipe, devpriv->usb_rx_buf,
|
|
|
- le16_to_cpu(ep->wMaxPacketSize), NULL,
|
|
|
+ usb_endpoint_maxp(ep), NULL,
|
|
|
HZ * 10);
|
|
|
}
|
|
|
|
|
@@ -220,7 +220,7 @@ static int vmk80xx_write_packet(struct comedi_device *dev, int cmd)
|
|
|
ep = devpriv->ep_tx;
|
|
|
pipe = usb_sndintpipe(usb, ep->bEndpointAddress);
|
|
|
return usb_interrupt_msg(usb, pipe, devpriv->usb_tx_buf,
|
|
|
- le16_to_cpu(ep->wMaxPacketSize), NULL,
|
|
|
+ usb_endpoint_maxp(ep), NULL,
|
|
|
HZ * 10);
|
|
|
}
|
|
|
|
|
@@ -230,7 +230,7 @@ static int vmk80xx_reset_device(struct comedi_device *dev)
|
|
|
size_t size;
|
|
|
int retval;
|
|
|
|
|
|
- size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize);
|
|
|
+ size = usb_endpoint_maxp(devpriv->ep_tx);
|
|
|
memset(devpriv->usb_tx_buf, 0, size);
|
|
|
retval = vmk80xx_write_packet(dev, VMK8055_CMD_RST);
|
|
|
if (retval)
|
|
@@ -684,12 +684,12 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
|
|
|
struct vmk80xx_private *devpriv = dev->private;
|
|
|
size_t size;
|
|
|
|
|
|
- size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize);
|
|
|
+ size = usb_endpoint_maxp(devpriv->ep_rx);
|
|
|
devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL);
|
|
|
if (!devpriv->usb_rx_buf)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize);
|
|
|
+ size = usb_endpoint_maxp(devpriv->ep_tx);
|
|
|
devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);
|
|
|
if (!devpriv->usb_tx_buf) {
|
|
|
kfree(devpriv->usb_rx_buf);
|