From 9bf297fc3404d8f4d6b04b5510821791aceaa62a Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 16 May 2012 10:23:07 +0200
Subject: [PATCH] --- yaml --- r: 303963 b: refs/heads/master c:
 5eaee54b1c52a83dc74445792cf49900a8050da8 h: refs/heads/master i:   303961:
 9da2dd25985309bfe4907313d11638c7fa8dfc84   303959:
 154a64202a59e7ea483475aa93aa1f24a1d9b9e5 v: v3

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

diff --git a/[refs] b/[refs]
index aa54bdc971bd..e296e0e37a5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea79c2ed6ec374347e4c61755bcb6fe8c2b24961
+refs/heads/master: 5eaee54b1c52a83dc74445792cf49900a8050da8
diff --git a/trunk/drivers/usb/gadget/at91_udc.c b/trunk/drivers/usb/gadget/at91_udc.c
index 43943aa965dc..1a4430f315c3 100644
--- a/trunk/drivers/usb/gadget/at91_udc.c
+++ b/trunk/drivers/usb/gadget/at91_udc.c
@@ -475,7 +475,7 @@ static int at91_ep_enable(struct usb_ep *_ep,
 	unsigned long	flags;
 
 	if (!_ep || !ep
-			|| !desc || ep->desc
+			|| !desc || ep->ep.desc
 			|| _ep->name == ep0name
 			|| desc->bDescriptorType != USB_DT_ENDPOINT
 			|| (maxpacket = usb_endpoint_maxp(desc)) == 0