aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pci')
-rw-r--r--arch/mips/pci/pci-lantiq.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 95681789b51e..910fb4c20b9e 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -214,13 +214,13 @@ static int ltq_pci_probe(struct platform_device *pdev)
214 return -EINVAL; 214 return -EINVAL;
215 } 215 }
216 216
217 ltq_pci_membase = devm_request_and_ioremap(&pdev->dev, res_bridge); 217 ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge);
218 ltq_pci_mapped_cfg = devm_request_and_ioremap(&pdev->dev, res_cfg); 218 if (IS_ERR(ltq_pci_membase))
219 return PTR_ERR(ltq_pci_membase);
219 220
220 if (!ltq_pci_membase || !ltq_pci_mapped_cfg) { 221 ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg);
221 dev_err(&pdev->dev, "failed to remap resources\n"); 222 if (IS_ERR(ltq_pci_mapped_cfg))
222 return -ENOMEM; 223 return PTR_ERR(ltq_pci_mapped_cfg);
223 }
224 224
225 ltq_pci_startup(pdev); 225 ltq_pci_startup(pdev);
226 226