diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:23:55 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:23:55 +0300 |
| commit | ee75520eb20cf3c9101742ecb219064ad4c3fec9 (patch) | |
| tree | ec75e46b3dc3078e1d6704c79f4d722df60f38fa /drivers/pci/dwc/pci-keystone.c | |
| parent | 199a0253e39dc62f419de1d00a7c7a16f4b0f720 (diff) | |
| parent | 8c934095fa2f336d92b722f49f78ca7abf47e051 (diff) | |
| download | linux-ee75520eb20cf3c9101742ecb219064ad4c3fec9.tar.xz | |
Merge branch 'pci/host-designware' into next
* pci/host-designware:
PCI: dwc: Clear MSI interrupt status after it is handled, not before
PCI: qcom: Allow ->post_init() to fail
PCI: qcom: Don't unroll init if ->init() fails
PCI: dwc: designware: Handle ->host_init() failures
PCI: dwc: designware: Test PCIE_ATU_ENABLE bit specifically
PCI: dwc: designware: Make dw_pcie_prog_*_atu_unroll() static
Diffstat (limited to 'drivers/pci/dwc/pci-keystone.c')
| -rw-r--r-- | drivers/pci/dwc/pci-keystone.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pci-keystone.c b/drivers/pci/dwc/pci-keystone.c index 4783cec1f78d..3ad3f8aa27b0 100644 --- a/drivers/pci/dwc/pci-keystone.c +++ b/drivers/pci/dwc/pci-keystone.c @@ -261,7 +261,7 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr, return 0; } -static void __init ks_pcie_host_init(struct pcie_port *pp) +static int __init ks_pcie_host_init(struct pcie_port *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); @@ -289,6 +289,8 @@ static void __init ks_pcie_host_init(struct pcie_port *pp) */ hook_fault_code(17, keystone_pcie_fault, SIGBUS, 0, "Asynchronous external abort"); + + return 0; } static const struct dw_pcie_host_ops keystone_pcie_host_ops = { |