Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 9d64dd02c57e..dab7927d1009 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -828,10 +828,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                         length, last ? " last" : "",
                         chain ? " chain" : "");
 
-        /* Skip the LINK-TRB on ISOC */
-        if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
-                        usb_endpoint_xfer_isoc(dep->endpoint.desc))
-                dep->free_slot++;
 
         trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
 
@@ -843,6 +839,10 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
         }
 
         dep->free_slot++;
+        /* Skip the LINK-TRB on ISOC */
+        if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
+                        usb_endpoint_xfer_isoc(dep->endpoint.desc))
+                dep->free_slot++;
 
         trb->size = DWC3_TRB_SIZE_LENGTH(length);
         trb->bpl = lower_32_bits(dma);