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:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-01-16 12:53:21 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-16 20:51:14 +0100
commit61e58f7cecb9f6044375dd7839f56a6e07807903 (patch)
tree98dd9710ba87d1aa00f4d398c6af080cace49b34 /target/linux/generic/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
parent7229981994d3459e9bd5911b3e36fd09ab4ec428 (diff)
downloadupstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.gz
upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.bz2
upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.zip
kernel: bump 5.10 to 5.10.92
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
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.patch9
1 files changed, 2 insertions, 7 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 2267821f73..5959d80592 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
@@ -17,11 +17,9 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
drivers/pci/controller/pci-aardvark.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
-index 6348584c33be..12eae05f3d10 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1695,6 +1695,7 @@ static int advk_pcie_remove(struct platform_device *pdev)
+@@ -1694,6 +1694,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);
@@ -29,7 +27,7 @@ index 6348584c33be..12eae05f3d10 100644
int i;
/* Remove PCI bus with all devices */
-@@ -1703,6 +1704,11 @@ static int advk_pcie_remove(struct platform_device *pdev)
+@@ -1702,6 +1703,11 @@ static int advk_pcie_remove(struct platf
pci_remove_root_bus(bridge->bus);
pci_unlock_rescan_remove();
@@ -41,6 +39,3 @@ index 6348584c33be..12eae05f3d10 100644
/* Remove IRQ domains */
advk_pcie_remove_msi_irq_domain(pcie);
advk_pcie_remove_irq_domain(pcie);
---
-2.34.1
-