Hi Bruce,

Would you please help merge this patch to linux-yocto-dev v5.5/standard/xlnx-soc?

This branch also needs this patch.

Thanks,

Quanyang

On 3/3/20 5:07 AM, Bruce Ashfield wrote:
merged (this is specific to linux-yocto, so I've grabbed it)

Cheers,

Bruce

On Fri, Feb 28, 2020 at 1:55 AM <[email protected]> wrote:
From: Quanyang Wang <[email protected]>

When merging upstream commit da10bcdd6f70 ("usb: dwc3: gadget: Delay starting 
transfer"),
a brace is lost. Add it to avoid compile error.

Signed-off-by: Quanyang Wang <[email protected]>
---
  drivers/usb/dwc3/gadget.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 4f8d3a73c03a..d5ca7114ede9 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1490,15 +1490,17 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, 
struct dwc3_request *req)
         list_add_tail(&req->list, &dep->pending_list);
         req->status = DWC3_REQUEST_STATUS_QUEUED;

+       /* Start the transfer only after the END_TRANSFER is completed */
+       if (dep->flags & DWC3_EP_END_TRANSFER_PENDING) {
+               dep->flags |= DWC3_EP_DELAY_START;
+               return 0;
+       }
+
         /* If core is hibernated, need to wakeup (remote wakeup) */
         if (dwc->is_hibernated) {
                 dwc->force_hiber_wake = true;
                 gadget_wakeup_interrupt(dwc);
                 dwc->force_hiber_wake = false;
-       /* Start the transfer only after the END_TRANSFER is completed */
-       if (dep->flags & DWC3_EP_END_TRANSFER_PENDING) {
-               dep->flags |= DWC3_EP_DELAY_START;
-               return 0;
         }

         /*
--
2.17.1




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#8451): 
https://lists.yoctoproject.org/g/linux-yocto/message/8451
Mute This Topic: https://lists.yoctoproject.org/mt/71603831/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to