From 3c6df8a26a67e634ffa711831ff1c076c4502459 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Wed, 18 Jan 2012 20:18:45 +0200
Subject: [PATCH] --- yaml --- r: 289615 b: refs/heads/master c:
 bb5cfd6811c63c47403e98028bde7e98bd7a1751 h: refs/heads/master i:   289613:
 4231ae08db5888ed43b003f01573b68a1828e300   289611:
 c61a482621db18deb24cd5c3e1ec1be5531a4c65   289607:
 87bef96b4c090caefbb2fd0f49cb67a1e41dc94a   289599:
 8de44224eaaa22660b148232459f26f327d1819d v: v3

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

diff --git a/[refs] b/[refs]
index 74d055a4bca7..b95a57dab5a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b7dd0253cd50fdc413b4ec199f1f3af08b7ba0d
+refs/heads/master: bb5cfd6811c63c47403e98028bde7e98bd7a1751
diff --git a/trunk/drivers/usb/dwc3/ep0.c b/trunk/drivers/usb/dwc3/ep0.c
index 5eb7095e4005..e90ebb9dd3e8 100644
--- a/trunk/drivers/usb/dwc3/ep0.c
+++ b/trunk/drivers/usb/dwc3/ep0.c
@@ -457,7 +457,7 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
 	case DWC3_ADDRESS_STATE:
 		ret = dwc3_ep0_delegate_req(dwc, ctrl);
 		/* if the cfg matches and the cfg is non zero */
-		if (!ret && cfg)
+		if (cfg && (!ret || (ret == USB_GADGET_DELAYED_STATUS)))
 			dwc->dev_state = DWC3_CONFIGURED_STATE;
 		break;