aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-12 13:04:51 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-16 20:26:38 +0200
commitb754b0c721131005efa7127151088e9c23dc9053 (patch)
tree2cfa46ff4a9a6da5afc53bb6e1bd9f83838d4687 /target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
parent8592df67f40b3afdee68e36dc3820187ec0f98fc (diff)
downloadupstream-b754b0c721131005efa7127151088e9c23dc9053.tar.gz
upstream-b754b0c721131005efa7127151088e9c23dc9053.tar.bz2
upstream-b754b0c721131005efa7127151088e9c23dc9053.zip
kernel: bump 5.10 to 5.10.115
Removed upstreamed: backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch')
-rw-r--r--target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch b/target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
index 5959d80592..c8d5e391b8 100644
--- a/target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
+++ b/target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
@@ -19,7 +19,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1694,6 +1694,7 @@ static int advk_pcie_remove(struct platf
+@@ -1690,6 +1690,7 @@ static int advk_pcie_remove(struct platf
{
struct advk_pcie *pcie = platform_get_drvdata(pdev);
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
@@ -27,7 +27,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
int i;
/* Remove PCI bus with all devices */
-@@ -1702,6 +1703,11 @@ static int advk_pcie_remove(struct platf
+@@ -1698,6 +1699,11 @@ static int advk_pcie_remove(struct platf
pci_remove_root_bus(bridge->bus);
pci_unlock_rescan_remove();