From ac734f04eebdf4b92c04209958a84a8e2ac04443 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 19 Jul 2012 21:05:08 +0300
Subject: [PATCH] --- yaml --- r: 325961 b: refs/heads/master c:
 7125d584d20ba7624488ddefa84b17ea6ce558f1 h: refs/heads/master i:   325959:
 e1cba9dc5d972c7b714599b26d284b556aaa8e2b v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/dwc3/ep0.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51a3625808f4..c637f51f4baf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e3db064855a637c45f7e011214f15bc536e61ad
+refs/heads/master: 7125d584d20ba7624488ddefa84b17ea6ce558f1
diff --git a/trunk/drivers/usb/dwc3/ep0.c b/trunk/drivers/usb/dwc3/ep0.c
index 3936c64c8bab..3f2c698a2bd1 100644
--- a/trunk/drivers/usb/dwc3/ep0.c
+++ b/trunk/drivers/usb/dwc3/ep0.c
@@ -164,10 +164,13 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 	 * handle it here.
 	 */
 	if (dwc->delayed_status) {
+		unsigned	direction;
+
+		direction = !dwc->ep0_expect_in;
 		dwc->delayed_status = false;
 
 		if (dwc->ep0state == EP0_STATUS_PHASE)
-			__dwc3_ep0_do_control_status(dwc, dwc->eps[1]);
+			__dwc3_ep0_do_control_status(dwc, dwc->eps[direction]);
 		else
 			dev_dbg(dwc->dev, "too early for delayed status\n");