diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-09 18:18:20 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-18 00:10:34 +0200 |
commit | e0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch) | |
tree | da9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch | |
parent | b4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff) | |
download | upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2 upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip |
kernel: bump 5.4 to 5.4.191
Merged upstream:
apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch
Similar patch merged upstream:
bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
Compile-tested: armvirt/64
Run-tested: armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch')
-rw-r--r-- | target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch index cf62099649..1362596097 100644 --- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch @@ -23,7 +23,7 @@ produce a noisy warning. xhci->quirks |= XHCI_RESET_ON_RESUME; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us +@@ -425,10 +425,14 @@ static int xhci_try_enable_msi(struct us free_irq(hcd->irq, hcd); hcd->irq = 0; @@ -43,7 +43,7 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1887,6 +1887,7 @@ struct xhci_hcd { +@@ -1890,6 +1890,7 @@ struct xhci_hcd { struct xhci_hub usb2_rhub; struct xhci_hub usb3_rhub; /* support xHCI 1.0 spec USB2 hardware LPM */ |