1 files changed, 11 insertions, 16 deletions

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 8e98b4df9b10..1e46005929e4 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -380,7 +380,7 @@ static void dwc2_hsotg_unmap_dma(struct dwc2_hsotg *hsotg,
 {
         struct usb_request *req = &hs_req->req;
 
-        usb_gadget_unmap_request(&hsotg->gadget, req, hs_ep->dir_in);
+        usb_gadget_unmap_request(&hsotg->gadget, req, hs_ep->map_dir);
 }
 
 /*
@@ -1163,6 +1163,7 @@ static int dwc2_hsotg_map_dma(struct dwc2_hsotg *hsotg,
 {
         int ret;
 
+        hs_ep->map_dir = hs_ep->dir_in;
         ret = usb_gadget_map_request(&hsotg->gadget, req, hs_ep->dir_in);
         if (ret)
                 goto dma_error;
@@ -1453,7 +1454,6 @@ static void dwc2_hsotg_complete_oursetup(struct usb_ep *ep,
 static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,
                                             u32 windex)
 {
-        struct dwc2_hsotg_ep *ep;
         int dir = (windex & USB_DIR_IN) ? 1 : 0;
         int idx = windex & 0x7F;
 
@@ -1463,12 +1463,7 @@ static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,
         if (idx > hsotg->num_of_eps)
                 return NULL;
 
-        ep = index_to_ep(hsotg, idx, dir);
-
-        if (idx && ep->dir_in != dir)
-                return NULL;
-
-        return ep;
+        return index_to_ep(hsotg, idx, dir);
 }
 
 /**
@@ -2650,12 +2645,14 @@ static void dwc2_hsotg_complete_in(struct dwc2_hsotg *hsotg,
                 return;
         }
 
-        /* Zlp for all endpoints, for ep0 only in DATA IN stage */
+        /* Zlp for all endpoints in non DDMA, for ep0 only in DATA IN stage */
         if (hs_ep->send_zlp) {
-                dwc2_hsotg_program_zlp(hsotg, hs_ep);
                 hs_ep->send_zlp = 0;
-                /* transfer will be completed on next complete interrupt */
-                return;
+                if (!using_desc_dma(hsotg)) {
+                        dwc2_hsotg_program_zlp(hsotg, hs_ep);
+                        /* transfer will be completed on next complete interrupt */
+                        return;
+                }
         }
 
         if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_DATA_IN) {
@@ -2922,9 +2919,7 @@ static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
 
                 /* In DDMA handle isochronous requests separately */
                 if (using_desc_dma(hsotg) && hs_ep->isochronous) {
-                        /* XferCompl set along with BNA */
-                        if (!(ints & DXEPINT_BNAINTR))
-                                dwc2_gadget_complete_isoc_request_ddma(hs_ep);
+                        dwc2_gadget_complete_isoc_request_ddma(hs_ep);
                 } else if (dir_in) {
                         /*
                          * We get OutDone from the FIFO, so we only
@@ -4823,7 +4818,7 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg)
                 hsotg->gadget.speed = USB_SPEED_UNKNOWN;
                 spin_unlock_irqrestore(&hsotg->lock, flags);
 
-                for (ep = 0; ep < hsotg->num_of_eps; ep++) {
+                for (ep = 1; ep < hsotg->num_of_eps; ep++) {
                         if (hsotg->eps_in[ep])
                                 dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);
                         if (hsotg->eps_out[ep])