diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:41:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:41:26 +0000 |
| commit | 3725eb6da034699cd8cfa4158035748e3deb35c3 (patch) | |
| tree | 157a0cef33fb6236c7b30a892d4d24aa0c9fc7f4 /target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch | |
| parent | ec6517b78759445162be616c3b5e66f6b4aae723 (diff) | |
| download | upstream-3725eb6da034699cd8cfa4158035748e3deb35c3.tar.gz upstream-3725eb6da034699cd8cfa4158035748e3deb35c3.tar.bz2 upstream-3725eb6da034699cd8cfa4158035748e3deb35c3.zip | |
cns3xxx: update to linux 3.10
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r41917
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@41921 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch b/target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch deleted file mode 100644 index 8d4d79e6d3..0000000000 --- a/target/linux/cns3xxx/patches-3.8/200-dwc_otg_support.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/drivers/Makefile -+++ b/drivers/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_PARIDE) += block/paride/ - obj-$(CONFIG_TC) += tc/ - obj-$(CONFIG_UWB) += uwb/ - obj-$(CONFIG_USB_OTG_UTILS) += usb/ -+obj-$(CONFIG_USB_DWC_OTG) += usb/dwc/ - obj-$(CONFIG_USB) += usb/ - obj-$(CONFIG_PCI) += usb/ - obj-$(CONFIG_USB_GADGET) += usb/ ---- a/drivers/usb/Kconfig -+++ b/drivers/usb/Kconfig -@@ -138,6 +138,8 @@ source "drivers/usb/chipidea/Kconfig" - - 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 -@@ -1401,6 +1401,9 @@ struct urb { - 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 */ |