Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
fix for dead code") from the usb-gadget-fixes tree and commit
ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/usb/dwc3/ep0.c
index df38e7ef4976,4c86772126ed..000000000000
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,10 -793,8 +793,12 @@@ static void dwc3_ep0_complete_data(stru
trb = dwc->ep0_trb;
+ trace_dwc3_complete_trb(ep0, trb);
+
+ r = next_request(&ep0->request_list);
+ if (!r)
+ return;
+
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
if (status == DWC3_TRBSTS_SETUP_PENDING) {
dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
Attachment:
pgpWqSrO9DHHp.pgp
Description: OpenPGP digital signature
