Commit 1002573e authored by Krzysztof Wilczyński's avatar Krzysztof Wilczyński Committed by Bjorn Helgaas
Browse files

PCI: cadence: Fix DMA range mapping early return error 

Function cdns_pcie_host_map_dma_ranges() iterates over a PCIe host bridge
DMA ranges using the resource_list_for_each_entry() iterator, returning an
error if cdns_pcie_host_bar_config() fails.

49e427e6 ("Merge branch 'pci/host-probe-refactor'") botched a merge so
it *always* returned after the first DMA range, even if no error occurred.

Fix the error checking so we return early only when an error occurs.

[bhelgaas: commit log]
Fixes: 49e427e6 ("Merge branch 'pci/host-probe-refactor'")
Link: https://lore.kernel.org/r/20210216205935.3112661-1-kw@linux.com


Signed-off-by: default avatarKrzysztof Wilczyński <kw@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7c53f6b6

drivers/pci/controller/cadence/pcie-cadence-host.c

+3 −2
Original line number Diff line number Diff line
@@ -321,10 +321,11 @@ 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 0;

}