By moving Full Speed max packet size change earlier, the code becomes
a little more straight forward to read.

Signed-off-by: Felipe Balbi <felipe.ba...@linux.intel.com>
---
 drivers/usb/host/xhci.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 39e67b7bece1..284dc6c10189 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1309,6 +1309,18 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct 
urb *urb, gfp_t mem_flag
        ep_index = xhci_get_endpoint_index(&urb->ep->desc);
        ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state;
 
+       if (usb_endpoint_xfer_control(&urb->ep->desc)) {
+               /* Check to see if the max packet size for the default control
+                * endpoint changed during FS device enumeration
+                */
+               if (urb->dev->speed == USB_SPEED_FULL) {
+                       ret = xhci_check_maxpacket(xhci, slot_id,
+                                       ep_index, urb);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
        if (!HCD_HW_ACCESSIBLE(hcd)) {
                if (!in_interrupt())
                        xhci_dbg(xhci, "urb submitted during PCI suspend\n");
@@ -1336,21 +1348,6 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct 
urb *urb, gfp_t mem_flag
 
        trace_xhci_urb_enqueue(urb);
 
-       if (usb_endpoint_xfer_control(&urb->ep->desc)) {
-               /* Check to see if the max packet size for the default control
-                * endpoint changed during FS device enumeration
-                */
-               if (urb->dev->speed == USB_SPEED_FULL) {
-                       ret = xhci_check_maxpacket(xhci, slot_id,
-                                       ep_index, urb);
-                       if (ret < 0) {
-                               xhci_urb_free_priv(urb_priv);
-                               urb->hcpriv = NULL;
-                               return ret;
-                       }
-               }
-       }
-
        spin_lock_irqsave(&xhci->lock, flags);
 
        if (*ep_state & EP_SOFT_CLEAR_TOGGLE) {
-- 
2.16.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to