1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index f03b136ecfce..8f65ab3a3b92 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -882,8 +882,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
 
                                 if (i == (request->num_mapped_sgs - 1) ||
                                                 sg_is_last(s)) {
-                                        if (list_is_last(&req->list,
-                                                        &dep->request_list))
+                                        if (list_empty(&dep->request_list))
                                                 last_one = true;
                                         chain = false;
                                 }
@@ -901,6 +900,9 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
                                 if (last_one)
                                         break;
                         }
+
+                        if (last_one)
+                                break;
                 } else {
                         dma = req->request.dma;
                         length = req->request.length;