From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 03:42:46 +0000 (-0700)
Subject: Merge 3.6-rc6 into usb-next
X-Git-Tag: v3.7-rc1~171^2~70
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bcb132c693566bcb8208cc7ce66b72a4f852ecf;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge 3.6-rc6 into usb-next

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

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

2bcb132c693566bcb8208cc7ce66b72a4f852ecf
diff --cc drivers/usb/dwc3/gadget.c
index ba444e7,c2813c2b..c9e729a
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -1078,10 -1091,26 +1082,23 @@@ static int __dwc3_gadget_ep_queue(struc
  	 *
  	 */
  	if (dep->flags & DWC3_EP_PENDING_REQUEST) {
+ 		int	ret;
+ 
+ 		/*
+ 		 * If xfernotready is already elapsed and it is a case
+ 		 * of isoc transfer, then issue END TRANSFER, so that
+ 		 * you can receive xfernotready again and can have
+ 		 * notion of current microframe.
+ 		 */
+ 		if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
+ 			dwc3_stop_active_transfer(dwc, dep->number);
+ 			return 0;
+ 		}
+ 
  		ret = __dwc3_gadget_kick_transfer(dep, 0, true);
 -		if (ret && ret != -EBUSY) {
 -			struct dwc3	*dwc = dep->dwc;
 -
 +		if (ret && ret != -EBUSY)
  			dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
  					dep->name);
 -		}
  	}
  
  	/*