From fc1aadb095533d090bce591c57b18aa38d171955 Mon Sep 17 00:00:00 2001
From: Bryan Wu <cooloney@kernel.org>
Date: Mon, 21 Dec 2009 10:43:06 -0500
Subject: [PATCH] --- yaml --- r: 185263 b: refs/heads/master c:
 3a8a3b1cee6c525661732b8bcf29ac63d42945ed h: refs/heads/master i:   185261:
 14e4bb2afafc876cacf5556ae6eda7ea069ac9c8   185259:
 483ccd00c17db8752fe343a5096e0daa8d992f08   185255:
 b3f689d1b734b9c0865113fd13dd596419073a16   185247:
 04dee41ffb8ef639f366aca8e40c3176ac4239ac v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/usb/gadget/epautoconf.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a7831070a651..80a245acfac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0e9485afb8db3abf58235abf6afded2df0db17
+refs/heads/master: 3a8a3b1cee6c525661732b8bcf29ac63d42945ed
diff --git a/trunk/drivers/usb/gadget/epautoconf.c b/trunk/drivers/usb/gadget/epautoconf.c
index cd0914ec898e..4671d5d7973d 100644
--- a/trunk/drivers/usb/gadget/epautoconf.c
+++ b/trunk/drivers/usb/gadget/epautoconf.c
@@ -275,6 +275,20 @@ struct usb_ep * __init usb_ep_autoconfig (
 		ep = find_ep (gadget, "ep1-bulk");
 		if (ep && ep_matches (gadget, ep, desc))
 			return ep;
+
+#ifdef CONFIG_BLACKFIN
+	} else if (gadget_is_musbhsfc(gadget) || gadget_is_musbhdrc(gadget)) {
+		if ((USB_ENDPOINT_XFER_BULK == type) ||
+		    (USB_ENDPOINT_XFER_ISOC == type)) {
+			if (USB_DIR_IN & desc->bEndpointAddress)
+				ep = find_ep (gadget, "ep5in");
+			else
+				ep = find_ep (gadget, "ep6out");
+		} else
+			ep = NULL;
+		if (ep && ep_matches (gadget, ep, desc))
+			return ep;
+#endif
 	}
 
 	/* Second, look at endpoints until an unclaimed one looks usable */