evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mcb: Fix error path of mcb_pci_probe

Browse source 
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: Johannes Thumshirn <johannes.thumshirn@men.de>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johannes Thumshirn 2015-01-12 16:26:32 +01:00 • committed by Greg Kroah-Hartman
parent d909f4315b
commit a48742bce1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mcb/mcb-pci.c
View file

@ -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); priv->mapbase = pci_resource_start(pdev, 0);
if (!priv->mapbase) { if (!priv->mapbase) {
dev_err(&pdev->dev, "No PCI resource\n"); dev_err(&pdev->dev, "No PCI resource\n");
goto err_start; goto out_disable;
} }
res = request_mem_region(priv->mapbase, CHAM_HEADER_SIZE, 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)) { if (IS_ERR(res)) {
dev_err(&pdev->dev, "Failed to request PCI memory\n"); dev_err(&pdev->dev, "Failed to request PCI memory\n");
ret = PTR_ERR(res); ret = PTR_ERR(res);
goto err_start; goto out_disable;
} }
priv->base = ioremap(priv->mapbase, CHAM_HEADER_SIZE); priv->base = ioremap(priv->mapbase, CHAM_HEADER_SIZE);
if (!priv->base) { if (!priv->base) {
dev_err(&pdev->dev, "Cannot ioremap\n"); dev_err(&pdev->dev, "Cannot ioremap\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_ioremap; goto out_release;
} }
flags = pci_resource_flags(pdev, 0); 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; ret = -ENOTSUPP;
dev_err(&pdev->dev, dev_err(&pdev->dev,
"IO mapped PCI devices are not supported\n"); "IO mapped PCI devices are not supported\n");
goto err_ioremap; goto out_release;
} }
pci_set_drvdata(pdev, priv); 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); priv->bus = mcb_alloc_bus(&pdev->dev);
if (IS_ERR(priv->bus)) { if (IS_ERR(priv->bus)) {
ret = PTR_ERR(priv->bus); ret = PTR_ERR(priv->bus);
goto err_drvdata; goto out_iounmap;
} }
priv->bus->get_irq = mcb_pci_get_irq; priv->bus->get_irq = mcb_pci_get_irq;
ret = chameleon_parse_cells(priv->bus, priv->mapbase, priv->base); ret = chameleon_parse_cells(priv->bus, priv->mapbase, priv->base);
if (ret < 0) if (ret < 0)
goto err_drvdata; goto out_iounmap;
num_cells = ret; num_cells = ret;
dev_dbg(&pdev->dev, "Found %d cells\n", num_cells); 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; return 0;
err_drvdata: out_iounmap:
iounmap(priv->base); iounmap(priv->base);
err_ioremap: out_release:
pci_release_region(pdev, 0); pci_release_region(pdev, 0);
err_start: out_disable:
pci_disable_device(pdev); pci_disable_device(pdev);
return ret; return ret;
} }