summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-05-04 18:43:30 +0300
committerBjorn Helgaas <bhelgaas@google.com>2021-05-04 18:43:30 +0300
commit2a2dd35fee87b7a0d373cd41d90cecf6348cdcbc (patch)
treededc21ee974c7e38173c794c3a7d00ea81577d7e /drivers/pci
parent04dcc048f343aea97c86bce81ad53b9a36037130 (diff)
parentd4707d79fae08c8996a1ba45965a491045a22dda (diff)
downloadlinux-2a2dd35fee87b7a0d373cd41d90cecf6348cdcbc.tar.xz
Merge branch 'remotes/lorenzo/pci/xgene'
- Fix cfg resource mapping regression (Dejin Zheng) * remotes/lorenzo/pci/xgene: PCI: xgene: Fix cfg resource mapping
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pci-xgene.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 2afdc865253e..7f503dd4ff81 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -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;