diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:42:42 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:42:42 +0000 |
| commit | c48a26ef7ef3fa6e74c6ad7ca8310b24b92cd2b0 (patch) | |
| tree | b3cd0d38e500014570e837c7903ca4679fe1db80 /target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch | |
| parent | 019f3dfb704999c77a8dca5872f356b9907e9c6d (diff) | |
| download | master-187ad058-c48a26ef7ef3fa6e74c6ad7ca8310b24b92cd2b0.tar.gz master-187ad058-c48a26ef7ef3fa6e74c6ad7ca8310b24b92cd2b0.tar.bz2 master-187ad058-c48a26ef7ef3fa6e74c6ad7ca8310b24b92cd2b0.zip | |
ramips: fix patches after 3.14.32 bump
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44324 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch b/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch index 38397ff8e1..e18b91fb77 100644 --- a/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch +++ b/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch @@ -5143,7 +5143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return 1; } -@@ -2970,6 +2973,7 @@ static int prepare_ring(struct xhci_hcd +@@ -2970,6 +2973,7 @@ static int prepare_ring(struct xhci_hcd next = ring->enqueue; while (last_trb(xhci, ring, ring->enq_seg, next)) { @@ -5151,7 +5151,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* If we're not dealing with 0.95 hardware or isoc rings * on AMD 0.96 host, clear the chain bit. */ -@@ -2979,7 +2983,9 @@ static int prepare_ring(struct xhci_hcd +@@ -2979,7 +2983,9 @@ static int prepare_ring(struct xhci_hcd next->link.control &= cpu_to_le32(~TRB_CHAIN); else next->link.control |= cpu_to_le32(TRB_CHAIN); @@ -5627,7 +5627,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ctrl_ctx->add_flags |= cpu_to_le32(added_ctxs); new_add_flags = le32_to_cpu(ctrl_ctx->add_flags); -@@ -2766,7 +2910,7 @@ int xhci_check_bandwidth(struct usb_hcd +@@ -2766,7 +2910,7 @@ int xhci_check_bandwidth(struct usb_hcd if (ctrl_ctx->add_flags == cpu_to_le32(SLOT_FLAG) && ctrl_ctx->drop_flags == 0) return 0; @@ -5651,7 +5651,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return xhci_calculate_intel_u2_timeout(udev, desc); } -@@ -4758,7 +4906,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4758,7 +4906,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, hcd->self.no_sg_constraint = 1; /* XHCI controllers don't stop the ep queue on short packets :| */ @@ -5661,7 +5661,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (usb_hcd_is_primary_hcd(hcd)) { xhci = kzalloc(sizeof(struct xhci_hcd), GFP_KERNEL); -@@ -4821,6 +4971,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4821,6 +4971,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, goto error; xhci_dbg(xhci, "Reset complete\n"); @@ -5777,7 +5777,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> }; /* convert between an HCD pointer and the corresponding EHCI_HCD */ -@@ -1726,7 +1745,7 @@ void xhci_urb_free_priv(struct xhci_hcd +@@ -1726,7 +1745,7 @@ void xhci_urb_free_priv(struct xhci_hcd void xhci_free_command(struct xhci_hcd *xhci, struct xhci_command *command); |