summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-02-24 23:59:19 +0300
committerBjorn Helgaas <bhelgaas@google.com>2021-02-24 23:59:19 +0300
commit617e3a8bc7c2270dd192cc1e5ca14c6664206149 (patch)
tree4aae6bb99f051506d37fa6754be0b6767132f8b9 /drivers/pci
parentda8eb3feea12b99d4d57a70a080dce1065bcfd09 (diff)
parent1002573ee33efef0988a9a546c075a9fa37d2498 (diff)
downloadlinux-617e3a8bc7c2270dd192cc1e5ca14c6664206149.tar.xz
Merge branch 'pci/host-probe-refactor'
- Fix merge botch in cdns_pcie_host_map_dma_ranges() (Krzysztof WilczyƄski) * pci/host-probe-refactor: PCI: cadence: Fix DMA range mapping early return error
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/cadence/pcie-cadence-host.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c
index 811c1cb2e8de..1cb7cfc75d6e 100644
--- a/drivers/pci/controller/cadence/pcie-cadence-host.c
+++ b/drivers/pci/controller/cadence/pcie-cadence-host.c
@@ -321,9 +321,10 @@ static int cdns_pcie_host_map_dma_ranges(struct cdns_pcie_rc *rc)
resource_list_for_each_entry(entry, &bridge->dma_ranges) {
err = cdns_pcie_host_bar_config(rc, entry);
- if (err)
+ if (err) {
dev_err(dev, "Fail to configure IB using dma-ranges\n");
- return err;
+ return err;
+ }
}
return 0;