usb: dwc3: gadget: fix trb ring full bug

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc3 / gadget.c

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 776de55028f6d3efa442943a8169ff3ee0768ab8..ca4229f3a1cc84848c5b3227acf29d5a97293635 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -876,10 +876,14 @@ static u32 dwc3_calc_trbs_left(struct dwc3_ep *dep)
         */
        if (dep->trb_enqueue == dep->trb_dequeue) {
                tmp = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
-               if (tmp->ctrl & DWC3_TRB_CTRL_HWO)
-                       return 0;
 
-               return DWC3_TRB_NUM - 1;
+               if (!(tmp->ctrl & DWC3_TRB_CTRL_HWO) ||
+                   ((tmp->ctrl & DWC3_TRB_CTRL_HWO) &&
+                    (tmp->ctrl & DWC3_TRB_CTRL_CSP) &&
+                    !dep->direction))
+                       return DWC3_TRB_NUM - 1;
+
+               return 0;
        }
 
        trbs_left = dep->trb_dequeue - dep->trb_enqueue;