From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Dec 2014 03:21:03 +0000 (-0800)
Subject: Merge 3.18-rc7 into usb-next
X-Git-Tag: v3.19-rc1~80^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c00552ebafddfe6abb397d957004f165e010abd2;p=linux.git

Merge 3.18-rc7 into usb-next

We need the xhci fixes here and this resolves a merge issue with
drivers/usb/dwc3/ep0.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

c00552ebafddfe6abb397d957004f165e010abd2
diff --cc drivers/usb/dwc3/ep0.c
index baeedbd67f77,df38e7ef4976..1bc77a3b4997
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,8 -791,10 +791,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");