Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87358169 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Bjorn Helgaas
Browse files

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: default avatarJisheng Zhang <jszhang@marvell.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c517d838

drivers/pci/host/pci-versatile.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -138,19 +138,19 @@ static int versatile_pci_probe(struct platform_device *pdev) 
	LIST_HEAD(pci_res);

	LIST_HEAD(pci_res);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -ENODEV;

	versatile_pci_base = devm_ioremap_resource(&pdev->dev, res);

	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);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!res)

		return -ENODEV;

	versatile_cfg_base[0] = devm_ioremap_resource(&pdev->dev, res);

	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);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);

	if (!res)

		return -ENODEV;

	versatile_cfg_base[1] = devm_ioremap_resource(&pdev->dev, res);

	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);

	ret = versatile_pci_parse_request_of_pci_ranges(&pdev->dev, &pci_res);

	if (ret)

	if (ret)