diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-01-16 15:12:01 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-06-04 21:57:53 +0200 |
| commit | f53d7680f3dc570a34ad99138272711ce44eba98 (patch) | |
| tree | 48fa73ddd7ae3b0f86864f8a2878a9d525f0ccf8 | |
| parent | 99d8d5d39895eaa0e44e7d793e1e0c3d4177838d (diff) | |
USB: cdc-wdm: kill the now unnecessary bMaxPacketSize0 field and udev variable
We don't need bMaxPacketSize0, and keeping all these different size fields
around will only cause us to use the wrong one.
Seems the udev variable was only used for getting bMaxPacketSize0. We
could have used it for the usb_fill_*_urb() calls, but as it wasn't
before - why start now? Instead make the interface_to_usbdev()
calls consistent.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 8143a8963c374116f84aba15dcaeaf02370c8098)
Signed-off-by: Bjørn Mork <bjorn@mork.no>
| -rw-r--r-- | drivers/usb/class/cdc-wdm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 18b91424c70..ebe369324f9 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -82,7 +82,6 @@ struct wdm_device { u16 bufsize; u16 wMaxCommand; u16 wMaxPacketSize; - u16 bMaxPacketSize0; __le16 inum; int reslength; int length; @@ -619,7 +618,6 @@ static void wdm_rxwork(struct work_struct *work) static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) { int rv = -EINVAL; - struct usb_device *udev = interface_to_usbdev(intf); struct wdm_device *desc; struct usb_host_interface *iface; struct usb_endpoint_descriptor *ep; @@ -680,7 +678,6 @@ next_desc: goto err; desc->wMaxPacketSize = usb_endpoint_maxp(ep); - desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0; desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); if (!desc->orq) @@ -739,7 +736,7 @@ next_desc: usb_fill_control_urb( desc->response, - interface_to_usbdev(desc->intf), + interface_to_usbdev(intf), /* using common endpoint 0 */ usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0), (unsigned char *)desc->irq, |