1 files changed, 75 insertions, 0 deletions
diff --git a/usb.current/usb-musb-cppi-bugfixes.patch b/usb.current/usb-musb-cppi-bugfixes.patch
new file mode 100644
index 00000000000000..a1f6a8fdc2d787
--- /dev/null
+++ b/usb.current/usb-musb-cppi-bugfixes.patch
@@ -0,0 +1,75 @@
+From david-b@pacbell.net  Sun Jan 25 12:55:57 2009
+From: Hugo Villeneuve <hugo@hugovil.com>
+Date: Sat, 24 Jan 2009 17:57:30 -0800
+Subject: USB: musb cppi bugfixes
+To: linux-usb@vger.kernel.org
+Cc: Greg KH <greg@kroah.com>, Felipe Balbi <felipebalbi@users.sourceforge.net>, Hugo Villeneuve <hugo@hugovil.com>
+Message-ID: <200901241757.30836.david-b@pacbell.net>
+Content-Disposition: inline
+
+
+From: Hugo Villeneuve <hugo@hugovil.com>
+
+These compilation errors are related to incorrect
+debugging macro and variable names and generated the
+following errors:
+
+  drivers/usb/musb/cppi_dma.c:437:5: warning: "MUSB_DEBUG" is not defined
+  drivers/usb/musb/cppi_dma.c: In function 'cppi_next_rx_segment':
+  drivers/usb/musb/cppi_dma.c:884: error: 'debug' undeclared (first use in this function)
+
+Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
+Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/musb/cppi_dma.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/musb/cppi_dma.c
++++ b/drivers/usb/musb/cppi_dma.c
+@@ -9,6 +9,7 @@
+ #include <linux/usb.h>
+ 
+ #include "musb_core.h"
++#include "musb_debug.h"
+ #include "cppi_dma.h"
+ 
+ 
+@@ -423,6 +424,7 @@ cppi_rndis_update(struct cppi_channel *c
+ 	}
+ }
+ 
++#ifdef CONFIG_USB_MUSB_DEBUG
+ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
+ {
+ 	pr_debug("RXBD/%s %08x: "
+@@ -431,10 +433,11 @@ static void cppi_dump_rxbd(const char *t
+ 			bd->hw_next, bd->hw_bufp, bd->hw_off_len,
+ 			bd->hw_options);
+ }
++#endif
+ 
+ static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx)
+ {
+-#if MUSB_DEBUG > 0
++#ifdef CONFIG_USB_MUSB_DEBUG
+ 	struct cppi_descriptor	*bd;
+ 
+ 	if (!_dbg_level(level))
+@@ -881,12 +884,14 @@ cppi_next_rx_segment(struct musb *musb, 
+ 	bd->hw_options |= CPPI_SOP_SET;
+ 	tail->hw_options |= CPPI_EOP_SET;
+ 
+-	if (debug >= 5) {
++#ifdef CONFIG_USB_MUSB_DEBUG
++	if (_dbg_level(5)) {
+ 		struct cppi_descriptor	*d;
+ 
+ 		for (d = rx->head; d; d = d->next)
+ 			cppi_dump_rxbd("S", d);
+ 	}
++#endif
+ 
+ 	/* in case the preceding transfer left some state... */
+ 	tail = rx->last_processed;