aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2022-02-16 17:50:59 +0100
committerPetr Štetiar <ynezz@true.cz>2022-02-16 21:47:59 +0100
commit2a3558b0de17f65b6c81a0e10e4d0b2e17071727 (patch)
treec1f598414d139c9d9460ec02da9f9feb2191aee5 /target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
parent3b6ce4f634cccf6517dacd4299917acd703c4bc1 (diff)
downloadupstream-2a3558b0de17f65b6c81a0e10e4d0b2e17071727.tar.gz
upstream-2a3558b0de17f65b6c81a0e10e4d0b2e17071727.tar.bz2
upstream-2a3558b0de17f65b6c81a0e10e4d0b2e17071727.zip
kernel: bump 4.14 to 4.14.267
All patches refreshed automagically without conflicts, but test builds choked on new BPF_UNPRIV_DEFAULT_OFF kernel config symbol introduced in upstream commit e69f08ba23a3 ("bpf: Add kconfig knob for disabling unpriv bpf by default"). Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch')
-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 f8b858aed2..47525dd8ec 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
@@ -528,7 +528,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
reg &= ~DWC3_DCTL_INITU2ENA;
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
-@@ -3244,6 +3244,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3257,6 +3257,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
{
int ret;
int irq;
@@ -536,7 +536,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
irq = dwc3_gadget_get_irq(dwc);
if (irq < 0) {
-@@ -3322,6 +3323,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3335,6 +3336,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed);