From 5747c828ab84201c45f3dcbd4fc1c79947a78284 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 9 Feb 2012 09:24:59 +0100
Subject: [PATCH] --- yaml --- r: 303805 b: refs/heads/master c:
 f99987bb261ed80f645ed0acd13732922ca10138 h: refs/heads/master i:   303803:
 836e9c6189f1d7583262eada4a6021b1355fd8ec v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/dummy_hcd.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 00a265214811..3fde11905c8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e87edf4922795f5e5e5be7934a36b6ff331022d
+refs/heads/master: f99987bb261ed80f645ed0acd13732922ca10138
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index a6dfd2164166..af063cbca4c4 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -595,14 +595,12 @@ static struct usb_request *dummy_alloc_request(struct usb_ep *_ep,
 
 static void dummy_free_request(struct usb_ep *_ep, struct usb_request *_req)
 {
-	struct dummy_ep		*ep;
 	struct dummy_request	*req;
 
-	if (!_ep || !_req)
-		return;
-	ep = usb_ep_to_dummy_ep(_ep);
-	if (!ep->desc && _ep->name != ep0name)
+	if (!_ep || !_req) {
+		__WARN();
 		return;
+	}
 
 	req = usb_request_to_dummy_request(_req);
 	WARN_ON(!list_empty(&req->queue));