Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
  usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
  usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
  USB: gadget: midi: memory leak in f_midi_bind_config()
  USB: gadget: midi: fix range check in f_midi_out_open()
  QE/FHCI: fixed the CONTROL bug
  usb: renesas_usbhs: tidyup for smatch warnings
  USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
  EHCI: workaround for MosChip controller bug
  usb: gadget: file_storage: fix race on unloading
  USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
  USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
  usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
  USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
  USB: Fix runtime wakeup on OHCI
  xHCI/USB: Make xHCI driver have a BOS descriptor.
  usb: gadget: add new usb gadget for ACM and mass storage
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 5b1665eb1bef..271a9d873608 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -527,7 +527,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         DBG(DBG_GADGET, "%s: ep_enable: desc=%p\n", ep->ep.name, desc);
 
-        maxpacket = le16_to_cpu(desc->wMaxPacketSize) & 0x7ff;
+        maxpacket = usb_endpoint_maxp(desc) & 0x7ff;
 
         if (((desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK) != ep->index)
                         || ep->index == 0
@@ -571,7 +571,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
                  * Bits 11:12 specify number of _additional_
                  * transactions per microframe.
                  */
-                nr_trans = ((le16_to_cpu(desc->wMaxPacketSize) >> 11) & 3) + 1;
+                nr_trans = ((usb_endpoint_maxp(desc) >> 11) & 3) + 1;
                 if (nr_trans > 3)
                         return -EINVAL;
 
@@ -1718,13 +1718,12 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                         spin_lock(&udc->lock);
                 }
 
-                if (status & USBA_HIGH_SPEED) {
-                        DBG(DBG_BUS, "High-speed bus reset detected\n");
+                if (status & USBA_HIGH_SPEED)
                         udc->gadget.speed = USB_SPEED_HIGH;
-                } else {
-                        DBG(DBG_BUS, "Full-speed bus reset detected\n");
+                else
                         udc->gadget.speed = USB_SPEED_FULL;
-                }
+                DBG(DBG_BUS, "%s bus reset detected\n",
+                    usb_speed_string(udc->gadget.speed));
 
                 ep0 = &usba_ep[0];
                 ep0->desc = &usba_ep0_desc;