From b970f2cdba32ac41aa56d7afa2888789b97d9e43 Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Thu, 3 Jan 2008 10:04:40 -0800
Subject: [PATCH] --- yaml --- r: 82170 b: refs/heads/master c:
 2336a986793c771008b181ec65334c240ce512ca h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ebaaf313234c..59f5a53d810d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3004e5379a525d848bbe8ddff2c534ac0fb04e2c
+refs/heads/master: 2336a986793c771008b181ec65334c240ce512ca
diff --git a/trunk/drivers/usb/gadget/fsl_usb2_udc.c b/trunk/drivers/usb/gadget/fsl_usb2_udc.c
index 038e7d7b4da1..d59eb92a847d 100644
--- a/trunk/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/trunk/drivers/usb/gadget/fsl_usb2_udc.c
@@ -776,7 +776,7 @@ fsl_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 		VDBG("%s, bad params\n", __FUNCTION__);
 		return -EINVAL;
 	}
-	if (!_ep || (!ep->desc && ep_index(ep))) {
+	if (unlikely(!_ep || !ep->desc)) {
 		VDBG("%s, bad ep\n", __FUNCTION__);
 		return -EINVAL;
 	}