usb: dwc3: gadget: Check MPS of the request length

When preparing for SG, not all the entries are prepared at once. When
resume, don't use the remaining request length to calculate for MPS
alignment. Use the entire request->length to do that.

Cc: stable@vger.kernel.org
Fixes: 5d187c0454ef ("usb: dwc3: gadget: Don't setup more than requested")
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index b2dfb3a..7e1909d 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1098,6 +1098,8 @@ static void dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,
        struct scatterlist *s;
        int             i;
        unsigned int length = req->request.length;
+       unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc);
+       unsigned int rem = length % maxp;
        unsigned int remaining = req->request.num_mapped_sgs
                - req->num_queued_sgs;
 
@@ -1109,8 +1111,6 @@ static void dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,
                length -= sg_dma_len(s);
 
        for_each_sg(sg, s, remaining, i) {
-               unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc);
-               unsigned int rem = length % maxp;
                unsigned int trb_length;
                unsigned int chain = true;