Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (70 commits)
  USB: remove duplicate device id from zc0301
  USB: remove duplicate device id from usb_storage
  USB: remove duplicate device id from keyspan
  USB: remove duplicate device id from ftdi_sio
  USB: remove duplicate device id from visor
  USB: a bit more coding style cleanup
  usbcore: trivial whitespace fixes
  usb-storage: use first bulk endpoints, not last
  EHCI: fix interrupt-driven remote wakeup
  USB: switch ehci-hcd to new polling scheme
  USB: autosuspend for usb printer driver
  USB Input: Added kernel module to support all GTCO CalComp USB InterWrite School products
  USB: Sierra Wireless auto set D0
  USB: usb ethernet gadget recognizes HUSB2DEV
  USB: list atmel husb2_udc gadget controller
  USB: gadgetfs AIO tweaks
  USB: gadgetfs behaves better on userspace init bug
  USB: gadgetfs race fix
  USB: gadgetfs simplifications
  USB: gadgetfs cleanups
  ...

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 9801d08edacf..94ea9727ff55 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -235,16 +235,15 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
 
         urb->status = -EINPROGRESS;
         urb->actual_length = 0;
-        urb->bandwidth = 0;
 
         /* Lots of sanity checks, so HCDs can rely on clean data
          * and don't need to duplicate tests
          */
         pipe = urb->pipe;
-        temp = usb_pipetype (pipe);
-        is_out = usb_pipeout (pipe);
+        temp = usb_pipetype(pipe);
+        is_out = usb_pipeout(pipe);
 
-        if (!usb_pipecontrol (pipe) && dev->state < USB_STATE_CONFIGURED)
+        if (!usb_pipecontrol(pipe) && dev->state < USB_STATE_CONFIGURED)
                 return -ENODEV;
 
         /* FIXME there should be a sharable lock protecting us against
@@ -253,11 +252,11 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
          * checks get made.)
          */
 
-        max = usb_maxpacket (dev, pipe, is_out);
+        max = usb_maxpacket(dev, pipe, is_out);
         if (max <= 0) {
                 dev_dbg(&dev->dev,
                         "bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
-                        usb_pipeendpoint (pipe), is_out ? "out" : "in",
+                        usb_pipeendpoint(pipe), is_out ? "out" : "in",
                         __FUNCTION__, max);
                 return -EMSGSIZE;
         }
@@ -279,11 +278,11 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                 if (urb->number_of_packets <= 0)                    
                         return -EINVAL;
                 for (n = 0; n < urb->number_of_packets; n++) {
-                        len = urb->iso_frame_desc [n].length;
+                        len = urb->iso_frame_desc[n].length;
                         if (len < 0 || len > max) 
                                 return -EMSGSIZE;
-                        urb->iso_frame_desc [n].status = -EXDEV;
-                        urb->iso_frame_desc [n].actual_length = 0;
+                        urb->iso_frame_desc[n].status = -EXDEV;
+                        urb->iso_frame_desc[n].actual_length = 0;
                 }
         }
 
@@ -322,7 +321,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
 
         /* fail if submitter gave bogus flags */
         if (urb->transfer_flags != orig_flags) {
-                err ("BOGUS urb flags, %x --> %x",
+                err("BOGUS urb flags, %x --> %x",
                         orig_flags, urb->transfer_flags);
                 return -EINVAL;
         }
@@ -373,7 +372,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                 urb->interval = temp;
         }
 
-        return usb_hcd_submit_urb (urb, mem_flags);
+        return usb_hcd_submit_urb(urb, mem_flags);
 }
 
 /*-------------------------------------------------------------------*/