Commit 617e3a8b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents da8eb3fe 1002573e

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;

}