diff options
| author | Jisheng Zhang <jszhang@marvell.com> | 2015-04-03 21:17:05 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-09 14:27:06 -0500 |
| commit | 873581698d391ff070fc1eb8fb298c85e873c07c (patch) | |
| tree | f81737ee89b76d564a316d7be9df0d5865946081 | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | blackbird-op-linux-873581698d391ff070fc1eb8fb298c85e873c07c.tar.gz blackbird-op-linux-873581698d391ff070fc1eb8fb298c85e873c07c.zip | |
PCI: versatile: Check for devm_ioremap_resource() failures
Check for failure of devm_ioremap_resource().
devm_ioremap_resource() validates the resource it receives, so if we check
for devm_ioremap_resource() failure, we need not check for failure of the
preceding platform_get_resource().
[bhelgaas: changelog]
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/host/pci-versatile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c index 1ec694a52379..b1caaea740fe 100644 --- a/drivers/pci/host/pci-versatile.c +++ b/drivers/pci/host/pci-versatile.c @@ -138,19 +138,19 @@ static int versatile_pci_probe(struct platform_device *pdev) LIST_HEAD(pci_res); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; versatile_pci_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(versatile_pci_base)) + return PTR_ERR(versatile_pci_base); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res) - return -ENODEV; versatile_cfg_base[0] = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(versatile_cfg_base[0])) + return PTR_ERR(versatile_cfg_base[0]); res = platform_get_resource(pdev, IORESOURCE_MEM, 2); - if (!res) - return -ENODEV; versatile_cfg_base[1] = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(versatile_cfg_base[1])) + return PTR_ERR(versatile_cfg_base[1]); ret = versatile_pci_parse_request_of_pci_ranges(&pdev->dev, &pci_res); if (ret) |
