You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.5 KiB
49 lines
1.5 KiB
12 years ago
|
--- a/drivers/usb/Kconfig
|
||
|
+++ b/drivers/usb/Kconfig
|
||
10 years ago
|
@@ -136,6 +136,8 @@ source "drivers/usb/musb/Kconfig"
|
||
12 years ago
|
|
||
|
source "drivers/usb/renesas_usbhs/Kconfig"
|
||
|
|
||
|
+source "drivers/usb/dwc/Kconfig"
|
||
|
+
|
||
|
source "drivers/usb/class/Kconfig"
|
||
|
|
||
|
source "drivers/usb/storage/Kconfig"
|
||
|
--- a/drivers/usb/core/urb.c
|
||
|
+++ b/drivers/usb/core/urb.c
|
||
|
@@ -17,7 +17,11 @@ static void urb_destroy(struct kref *kre
|
||
|
|
||
|
if (urb->transfer_flags & URB_FREE_BUFFER)
|
||
|
kfree(urb->transfer_buffer);
|
||
|
-
|
||
|
+ if (urb->aligned_transfer_buffer) {
|
||
|
+ kfree(urb->aligned_transfer_buffer);
|
||
|
+ urb->aligned_transfer_buffer = 0;
|
||
|
+ urb->aligned_transfer_dma = 0;
|
||
|
+ }
|
||
|
kfree(urb);
|
||
|
}
|
||
|
|
||
|
--- a/include/linux/usb.h
|
||
|
+++ b/include/linux/usb.h
|
||
10 years ago
|
@@ -1404,6 +1404,9 @@ struct urb {
|
||
12 years ago
|
unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/
|
||
|
void *transfer_buffer; /* (in) associated data buffer */
|
||
|
dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */
|
||
|
+ void *aligned_transfer_buffer; /* (in) associeated data buffer */
|
||
|
+ dma_addr_t aligned_transfer_dma;/* (in) dma addr for transfer_buffer */
|
||
|
+ u32 aligned_transfer_buffer_length; /* (in) data buffer length */
|
||
|
struct scatterlist *sg; /* (in) scatter gather buffer list */
|
||
|
int num_mapped_sgs; /* (internal) mapped sg entries */
|
||
|
int num_sgs; /* (in) number of entries in the sg list */
|
||
10 years ago
|
--- a/drivers/usb/Makefile
|
||
|
+++ b/drivers/usb/Makefile
|
||
|
@@ -7,6 +7,7 @@
|
||
|
obj-$(CONFIG_USB) += core/
|
||
|
|
||
|
obj-$(CONFIG_USB_DWC3) += dwc3/
|
||
|
+obj-$(CONFIG_USB_DWC_OTG) += dwc/
|
||
|
|
||
|
obj-$(CONFIG_USB_MON) += mon/
|
||
|
|