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, 12 insertions, 11 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 70644506651f..7e7ec29782f1 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -731,26 +731,27 @@ static int get_pipes(struct us_data *us)
         struct usb_endpoint_descriptor *ep_int = NULL;
 
         /*
-         * Find the endpoints we need.
+         * Find the first endpoint of each type we need.
          * We are expecting a minimum of 2 endpoints - in and out (bulk).
-         * An optional interrupt is OK (necessary for CBI protocol).
+         * An optional interrupt-in is OK (necessary for CBI protocol).
          * We will ignore any others.
          */
         for (i = 0; i < altsetting->desc.bNumEndpoints; i++) {
                 ep = &altsetting->endpoint[i].desc;
 
-                /* Is it a BULK endpoint? */
                 if (usb_endpoint_xfer_bulk(ep)) {
-                        /* BULK in or out? */
-                        if (usb_endpoint_dir_in(ep))
-                                ep_in = ep;
-                        else
-                                ep_out = ep;
+                        if (usb_endpoint_dir_in(ep)) {
+                                if (!ep_in)
+                                        ep_in = ep;
+                        } else {
+                                if (!ep_out)
+                                        ep_out = ep;
+                        }
                 }
 
-                /* Is it an interrupt endpoint? */
-                else if (usb_endpoint_xfer_int(ep)) {
-                        ep_int = ep;
+                else if (usb_endpoint_is_int_in(ep)) {
+                        if (!ep_int)
+                                ep_int = ep;
                 }
         }