mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-04 04:28:10 -04:00
Merge tag 'fixes-for-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v3.18-rc5 Just one fix here on dwc3 which fixes a minor bug caused by a fix that went in this v3.18-rc cycle. The corner case is minimal as it can only be reproduced with back-to-back Setup transfers (without starting data or status phase) by means of a LeCroy USB Trainer, where we can generate USB packets any way we like. Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
@@ -791,6 +791,10 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
|
||||
|
||||
trb = dwc->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");
|
||||
@@ -801,10 +805,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
|
||||
return;
|
||||
}
|
||||
|
||||
r = next_request(&ep0->request_list);
|
||||
if (!r)
|
||||
return;
|
||||
|
||||
ur = &r->request;
|
||||
|
||||
length = trb->size & DWC3_TRB_SIZE_MASK;
|
||||
|
||||
Reference in New Issue
Block a user