From: Tony Lindgren <tony@atomide.com>
Date: Fri, 5 Sep 2008 00:56:05 +0000 (-0700)
Subject: Sync USB code with mainline
X-Git-Tag: v2.6.27-omap1~266
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=03e9e82f1856ba22f84df1b821864571ae8dd189;p=linux-2.6-omap-h63xx.git

Sync USB code with mainline

Based on comments from Dave:

NAK.  The Apollon-specific bit should be done some other way,
and whatever silicon issue it's covering up is not specific to
that board ...

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 3d811939108..af76a251572 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2604,9 +2604,7 @@ omap_ep_setup(char *name, u8 addr, u8 type,
 		 * and ignored for PIO-IN on newer chips
 		 * (for more reliable behavior)
 		 */
-		if ((!use_dma && (addr & USB_DIR_IN))
-				|| machine_is_omap_apollon()
-				|| cpu_is_omap15xx())
+		if (!use_dma || cpu_is_omap15xx() || cpu_is_omap24xx())
 			dbuf = 0;
 
 		switch (maxp) {