Commit a48742bc authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman
Browse files

mcb: Fix error path of mcb_pci_probe 



If a MCB PCI Carrier device is IO mapped insted of memory-mapped (which is
currently unsupported by the upstream driver) the probe function bails out
with -ENOTSUPP.

In this case the memory of the PCI device was not unmapped.
Also rename error label to reflect what will happen at the destination (suggested
by Julia Lawall <julia.lawall@lip6.fr>.

Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@men.de>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d909f431

drivers/mcb/mcb-pci.c

+9 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	priv->mapbase = pci_resource_start(pdev, 0);

	if (!priv->mapbase) {

		dev_err(&pdev->dev, "No PCI resource\n");

		goto err_start;

		goto out_disable;

	}



	res = request_mem_region(priv->mapbase, CHAM_HEADER_SIZE,
@@ -59,14 +59,14 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (IS_ERR(res)) {

		dev_err(&pdev->dev, "Failed to request PCI memory\n");

		ret = PTR_ERR(res);

		goto err_start;

		goto out_disable;

	}



	priv->base = ioremap(priv->mapbase, CHAM_HEADER_SIZE);

	if (!priv->base) {

		dev_err(&pdev->dev, "Cannot ioremap\n");

		ret = -ENOMEM;

		goto err_ioremap;

		goto out_release;

	}



	flags = pci_resource_flags(pdev, 0);
@@ -74,7 +74,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		ret = -ENOTSUPP;

		dev_err(&pdev->dev,

			"IO mapped PCI devices are not supported\n");

		goto err_ioremap;

		goto out_release;

	}



	pci_set_drvdata(pdev, priv);
@@ -82,14 +82,14 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	priv->bus = mcb_alloc_bus(&pdev->dev);

	if (IS_ERR(priv->bus)) {

		ret = PTR_ERR(priv->bus);

		goto err_drvdata;

		goto out_iounmap;

	}



	priv->bus->get_irq = mcb_pci_get_irq;



	ret = chameleon_parse_cells(priv->bus, priv->mapbase, priv->base);

	if (ret < 0)

		goto err_drvdata;

		goto out_iounmap;

	num_cells = ret;



	dev_dbg(&pdev->dev, "Found %d cells\n", num_cells);
@@ -98,11 +98,11 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	return 0;



err_drvdata:

out_iounmap:

	iounmap(priv->base);

err_ioremap:

out_release:

	pci_release_region(pdev, 0);

err_start:

out_disable:

	pci_disable_device(pdev);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE