diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-21 00:16:35 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-21 00:16:35 +0300 |
| commit | 0c78d418e95ff12ac53446effe9a042e73b406e3 (patch) | |
| tree | b89c23e56d93293ebb7bdb5f2ade1a12603f74a8 /drivers/pci | |
| parent | 580b8bce6bd8817e220d2539ad2e14710fe5d8b2 (diff) | |
| parent | 5f5ac460dfe7f4e11f99de9870f240e39189cf72 (diff) | |
| download | linux-0c78d418e95ff12ac53446effe9a042e73b406e3.tar.xz | |
Merge branch 'pci/controller/dwc'
- Install i.MX6 PCI abort handler only when DT contains a PCI controller
claimed by the imx6 driver (H. Nikolaus Schaller)
* pci/controller/dwc:
PCI: imx6: Install the fault handler only on compatible match
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-imx6.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 55a0405b921d..52906f999f2b 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1566,6 +1566,13 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, 0xabcd, static int __init imx6_pcie_init(void) { #ifdef CONFIG_ARM + struct device_node *np; + + np = of_find_matching_node(NULL, imx6_pcie_of_match); + if (!np) + return -ENODEV; + of_node_put(np); + /* * Since probe() can be deferred we need to make sure that * hook_fault_code is not called after __init memory is freed |