diff options
| author | Varka Bhadram <varkabhadram@gmail.com> | 2014-10-22 00:01:15 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-10-22 12:14:04 -0400 |
| commit | 5a1e73ffe57a86a196c08dffcbd9866776594a38 (patch) | |
| tree | 899df6d50b7be6723ce23a9997d6608e5d70e01d | |
| parent | 507a369e126bf094ffcef77735a56e25a61e9041 (diff) | |
pci: pci-lantiq: remove duplicate check on resource
Sanity check on resource happening with devm_ioremap_resource()
Signed-off-by: Varka Bhadram <varkab@cdac.in>
Acked-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: Varka Bhadram <varkab@cdac.in>
Patchwork: https://patchwork.linux-mips.org/patch/8199/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/pci/pci-lantiq.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index 37fe8e7887e2..d3ed15b2b2d1 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c | |||
| @@ -215,17 +215,12 @@ static int ltq_pci_probe(struct platform_device *pdev) | |||
| 215 | 215 | ||
| 216 | pci_clear_flags(PCI_PROBE_ONLY); | 216 | pci_clear_flags(PCI_PROBE_ONLY); |
| 217 | 217 | ||
| 218 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 219 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 218 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
| 220 | if (!res_cfg || !res_bridge) { | ||
| 221 | dev_err(&pdev->dev, "missing memory resources\n"); | ||
| 222 | return -EINVAL; | ||
| 223 | } | ||
| 224 | |||
| 225 | ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge); | 219 | ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge); |
| 226 | if (IS_ERR(ltq_pci_membase)) | 220 | if (IS_ERR(ltq_pci_membase)) |
| 227 | return PTR_ERR(ltq_pci_membase); | 221 | return PTR_ERR(ltq_pci_membase); |
| 228 | 222 | ||
| 223 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 229 | ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg); | 224 | ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg); |
| 230 | if (IS_ERR(ltq_pci_mapped_cfg)) | 225 | if (IS_ERR(ltq_pci_mapped_cfg)) |
| 231 | return PTR_ERR(ltq_pci_mapped_cfg); | 226 | return PTR_ERR(ltq_pci_mapped_cfg); |
