X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fcore%2Fbuffer.c;h=ad742cec94fa09d1e8b5f5b1b9f0cf249b9e9e57;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=1e2a42ad34a40e152eab5af2d14a698518f7112f;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index 1e2a42ad3..ad742cec9 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -15,14 +15,6 @@
 #include <asm/scatterlist.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
-
-
-#ifdef CONFIG_USB_DEBUG
-	#define DEBUG
-#else
-	#undef DEBUG
-#endif
-
 #include <linux/usb.h>
 #include "hcd.h"
 
@@ -63,6 +55,9 @@ int hcd_buffer_create (struct usb_hcd *hcd)
 	char		name [16];
 	int 		i, size;
 
+	if (!hcd->self.controller->dma_mask)
+		return 0;
+
 	for (i = 0; i < HCD_BUFFER_POOLS; i++) { 
 		if (!(size = pool_max [i]))
 			continue;
@@ -76,7 +71,6 @@ int hcd_buffer_create (struct usb_hcd *hcd)
 	}
 	return 0;
 }
-EXPORT_SYMBOL (hcd_buffer_create);
 
 
 /**
@@ -98,7 +92,6 @@ void hcd_buffer_destroy (struct usb_hcd *hcd)
 		}
 	}
 }
-EXPORT_SYMBOL (hcd_buffer_destroy);
 
 
 /* sometimes alloc/free could use kmalloc with SLAB_DMA, for
@@ -108,7 +101,7 @@ EXPORT_SYMBOL (hcd_buffer_destroy);
 void *hcd_buffer_alloc (
 	struct usb_bus 		*bus,
 	size_t			size,
-	int			mem_flags,
+	gfp_t			mem_flags,
 	dma_addr_t		*dma
 )
 {