From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri, 10 Nov 2006 00:11:46 +0000 (+0200)
Subject: ARM: OMAP: fix apollon USB device support
X-Git-Tag: v2.6.19-omap1~65
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f6cfbcda9e25b41daf14bd85595ea6517904ac7c;p=linux-2.6-omap-h63xx.git

ARM: OMAP: fix apollon USB device support

-  Add apollon use the non-double-buffering in PIO mode
-  Fix compiler warning

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
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 ceba0a4d383..31df02e87a5 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2579,6 +2579,7 @@ omap_ep_setup(char *name, u8 addr, u8 type,
 		 * (for more reliable behavior)
 		 */
 		if ((!use_dma && (addr & USB_DIR_IN))
+				|| machine_is_omap_apollon()
 				|| cpu_is_omap15xx())
 			dbuf = 0;
 
@@ -2963,9 +2964,10 @@ known:
 	}
 
 	create_proc_file();
-	device_add(&udc->gadget.dev);
-	return 0;
-
+	status = device_add(&udc->gadget.dev);
+	if (!status)
+		return status;
+	/* If fail, fall through */
 #ifdef	USE_ISO
 cleanup3:
 	free_irq(pdev->resource[2].start, udc);