diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:19 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:19 -0600 |
| commit | 617e3a8bc7c2270dd192cc1e5ca14c6664206149 (patch) | |
| tree | 4aae6bb99f051506d37fa6754be0b6767132f8b9 /drivers/pci | |
| parent | da8eb3feea12b99d4d57a70a080dce1065bcfd09 (diff) | |
| parent | 1002573ee33efef0988a9a546c075a9fa37d2498 (diff) | |
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.c | 5 |
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; |