aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-05 10:58:45 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-08 12:07:28 +0200
commit5eac37624f0369dff30cbe7be0e037879b96df99 (patch)
tree67f0a2456275d6da72c2fe023b722aeb3ac63d0c /target/linux/layerscape
parent6fe9127a56e25330631f607b429e3f7dd6699373 (diff)
downloadupstream-5eac37624f0369dff30cbe7be0e037879b96df99.tar.gz
upstream-5eac37624f0369dff30cbe7be0e037879b96df99.tar.bz2
upstream-5eac37624f0369dff30cbe7be0e037879b96df99.zip
kernel: bump 4.14 to 4.14.110
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
index 35fa2545eb..b5cbb4096f 100644
--- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
@@ -1202,7 +1202,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
xhci->quirks |= XHCI_BROKEN_PORT_PED;
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
-@@ -1969,10 +1969,12 @@ static int finish_td(struct xhci_hcd *xh
+@@ -1972,10 +1972,12 @@ static int finish_td(struct xhci_hcd *xh
union xhci_trb *ep_trb, struct xhci_transfer_event *event,
struct xhci_virt_ep *ep, int *status)
{
@@ -1215,7 +1215,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
u32 trb_comp_code;
int ep_index;
-@@ -1995,14 +1997,30 @@ static int finish_td(struct xhci_hcd *xh
+@@ -1998,14 +2000,30 @@ static int finish_td(struct xhci_hcd *xh
if (trb_comp_code == COMP_STALL_ERROR ||
xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
trb_comp_code)) {