diff options
| author | Kuninori Morimoto <[email protected]> | 2011-08-23 10:12:03 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-08-23 16:47:40 +0000 |
| commit | 29cc88979a8818cd8c5019426e945aed118b400e (patch) | |
| tree | 849401ad869d09ce45dd7a3fadd7eb71b1e9fcbd /drivers/usb/misc/ldusb.c | |
| parent | usb: include module.h in the DesignWare USB3 DRD driver (diff) | |
| download | kernel-29cc88979a8818cd8c5019426e945aed118b400e.tar.gz kernel-29cc88979a8818cd8c5019426e945aed118b400e.zip | |
USB: use usb_endpoint_maxp() instead of le16_to_cpu()
Now ${LINUX}/drivers/usb/* can use usb_endpoint_maxp(desc) to get maximum packet size
instead of le16_to_cpu(desc->wMaxPacketSize).
This patch fix it up
Cc: Armin Fuerst <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: Johannes Erdfelt <[email protected]>
Cc: Vojtech Pavlik <[email protected]>
Cc: Oliver Neukum <[email protected]>
Cc: David Kubicek <[email protected]>
Cc: Johan Hovold <[email protected]>
Cc: Brad Hards <[email protected]>
Acked-by: Felipe Balbi <[email protected]>
Cc: Sebastian Andrzej Siewior <[email protected]>
Cc: Thomas Dahlmann <[email protected]>
Cc: David Brownell <[email protected]>
Cc: David Lopo <[email protected]>
Cc: Alan Stern <[email protected]>
Cc: Michal Nazarewicz <[email protected]>
Cc: Xie Xiaobo <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Jiang Bo <[email protected]>
Cc: Yuan-hsin Chen <[email protected]>
Cc: Darius Augulis <[email protected]>
Cc: Xiaochen Shen <[email protected]>
Cc: Yoshihiro Shimoda <[email protected]>
Cc: OKI SEMICONDUCTOR, <[email protected]>
Cc: Robert Jarzmik <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: Thomas Abraham <[email protected]>
Cc: Herbert Pƶtzl <[email protected]>
Cc: Arnaud Patard <[email protected]>
Cc: Roman Weissgaerber <[email protected]>
Acked-by: Sarah Sharp <[email protected]>
Cc: Tony Olech <[email protected]>
Cc: Florian Floe Echtler <[email protected]>
Cc: Christian Lucht <[email protected]>
Cc: Juergen Stuber <[email protected]>
Cc: Georges Toth <[email protected]>
Cc: Bill Ryder <[email protected]>
Cc: Kuba Ober <[email protected]>
Cc: Inaky Perez-Gonzalez <[email protected]>
Signed-off-by: Kuninori Morimoto <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/misc/ldusb.c')
| -rw-r--r-- | drivers/usb/misc/ldusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index cb4096201e29..48c166f0d764 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c @@ -721,7 +721,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * if (dev->interrupt_out_endpoint == NULL) dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n"); - dev->interrupt_in_endpoint_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize); + dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint); dev->ring_buffer = kmalloc(ring_buffer_size*(sizeof(size_t)+dev->interrupt_in_endpoint_size), GFP_KERNEL); if (!dev->ring_buffer) { dev_err(&intf->dev, "Couldn't allocate ring_buffer\n"); @@ -737,7 +737,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * dev_err(&intf->dev, "Couldn't allocate interrupt_in_urb\n"); goto error; } - dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize) : + dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? usb_endpoint_maxp(dev->interrupt_out_endpoint) : udev->descriptor.bMaxPacketSize0; dev->interrupt_out_buffer = kmalloc(write_buffer_size*dev->interrupt_out_endpoint_size, GFP_KERNEL); if (!dev->interrupt_out_buffer) { |
