Commit 2a2dd35f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/xgene' 

- Fix cfg resource mapping regression (Dejin Zheng)

* remotes/lorenzo/pci/xgene:
  PCI: xgene: Fix cfg resource mapping
parents 04dcc048 d4707d79

drivers/pci/controller/pci-xgene.c

+2 −1
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ static int xgene_pcie_map_reg(struct xgene_pcie_port *port, 
	if (IS_ERR(port->csr_base))

		return PTR_ERR(port->csr_base);



	port->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg");

	port->cfg_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(port->cfg_base))

		return PTR_ERR(port->cfg_base);

	port->cfg_addr = res->start;