From a3a3cc9e4dfac3521139750171588612acdf4661 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Wed, 29 Jun 2011 16:41:57 +0300
Subject: [PATCH] --- yaml --- r: 259235 b: refs/heads/master c:
 877c1f5408a94cd8a0fa1de4e4806830c1839e8d h: refs/heads/master i:   259233:
 bbc281ffa2090662ccc2ee38c26d3e92175e14e2   259231:
 52e1d28a0c5c3681b07e1409b6a2a7cd19b44453 v: v3

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

diff --git a/[refs] b/[refs]
index 63e35917871f..e17cf3d0868b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 513385a3cf97e9fb7e982afffeb013a12a7ccbd2
+refs/heads/master: 877c1f5408a94cd8a0fa1de4e4806830c1839e8d
diff --git a/trunk/drivers/usb/gadget/ci13xxx_udc.c b/trunk/drivers/usb/gadget/ci13xxx_udc.c
index 909bc45c0be0..082471650fbc 100644
--- a/trunk/drivers/usb/gadget/ci13xxx_udc.c
+++ b/trunk/drivers/usb/gadget/ci13xxx_udc.c
@@ -2620,10 +2620,13 @@ static int ci13xxx_start(struct usb_gadget_driver *driver,
 	if (retval)
 		goto done;
 	spin_unlock_irqrestore(udc->lock, flags);
-	retval = usb_ep_enable(&udc->ep0out.ep, &ctrl_endpt_out_desc);
+	udc->ep0out.ep.desc = &ctrl_endpt_out_desc;
+	retval = usb_ep_enable(&udc->ep0out.ep);
 	if (retval)
 		return retval;
-	retval = usb_ep_enable(&udc->ep0in.ep, &ctrl_endpt_in_desc);
+
+	udc->ep0in.ep.desc = &ctrl_endpt_in_desc;
+	retval = usb_ep_enable(&udc->ep0in.ep);
 	if (retval)
 		return retval;
 	spin_lock_irqsave(udc->lock, flags);