git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
usb
/
core
/
buffer.c
diff --git
a/drivers/usb/core/buffer.c
b/drivers/usb/core/buffer.c
index
1e2a42a
..
ad742ce
100644
(file)
--- 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>
#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"
#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;
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;
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;
}
}
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
/* 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,
void *hcd_buffer_alloc (
struct usb_bus *bus,
size_t size,
-
int
mem_flags,
+
gfp_t
mem_flags,
dma_addr_t *dma
)
{
dma_addr_t *dma
)
{