From a762b4051256d9b77ecb0ae2c0c9dcc219cd6b87 Mon Sep 17 00:00:00 2001
From: Ido Shayevitz <idos@codeaurora.org>
Date: Mon, 12 Mar 2012 20:25:30 +0200
Subject: [PATCH] --- yaml --- r: 303787 b: refs/heads/master c:
 fab1137f63c417da02406a3a97c77790e6d06e6f h: refs/heads/master i:   303785:
 3a77daa9258f9dce9298fc4d47eca152e47b67c0   303783:
 7803604235bb8e66e8c64c9fe8be97e6258505ff v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/fusb300_udc.c | 4 ++--
 trunk/drivers/usb/gadget/fusb300_udc.h | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0233eb292cbb..9c6d3a54de38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79149b8bd0270a268344300a77a2dd3f51039f14
+refs/heads/master: fab1137f63c417da02406a3a97c77790e6d06e6f
diff --git a/trunk/drivers/usb/gadget/fusb300_udc.c b/trunk/drivers/usb/gadget/fusb300_udc.c
index 5831cb4a0b35..cdd94540e1cd 100644
--- a/trunk/drivers/usb/gadget/fusb300_udc.c
+++ b/trunk/drivers/usb/gadget/fusb300_udc.c
@@ -203,7 +203,7 @@ static int config_ep(struct fusb300_ep *ep,
 	struct fusb300 *fusb300 = ep->fusb300;
 	struct fusb300_ep_info info;
 
-	ep->desc = desc;
+	ep->ep.desc = desc;
 
 	info.interval = 0;
 	info.addrofs = 0;
@@ -443,7 +443,7 @@ static int fusb300_queue(struct usb_ep *_ep, struct usb_request *_req,
 	req->req.actual = 0;
 	req->req.status = -EINPROGRESS;
 
-	if (ep->desc == NULL) /* ep0 */
+	if (ep->ep.desc == NULL) /* ep0 */
 		ep0_queue(ep, req);
 	else if (request && !ep->stall)
 		enable_fifo_int(ep);
diff --git a/trunk/drivers/usb/gadget/fusb300_udc.h b/trunk/drivers/usb/gadget/fusb300_udc.h
index 92745bd03064..542cd83cc806 100644
--- a/trunk/drivers/usb/gadget/fusb300_udc.h
+++ b/trunk/drivers/usb/gadget/fusb300_udc.h
@@ -650,7 +650,6 @@ struct fusb300_ep {
 
 	unsigned char		epnum;
 	unsigned char		type;
-	const struct usb_endpoint_descriptor	*desc;
 };
 
 struct fusb300 {