Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Small enhancement to the release notes document
[kvmfornfv.git]
/
kernel
/
drivers
/
mcb
/
mcb-pci.c
diff --git
a/kernel/drivers/mcb/mcb-pci.c
b/kernel/drivers/mcb/mcb-pci.c
index
de36237
..
67d5e7d
100644
(file)
--- a/
kernel/drivers/mcb/mcb-pci.c
+++ b/
kernel/drivers/mcb/mcb-pci.c
@@
-51,6
+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");
priv->mapbase = pci_resource_start(pdev, 0);
if (!priv->mapbase) {
dev_err(&pdev->dev, "No PCI resource\n");
+ ret = -ENODEV;
goto out_disable;
}
goto out_disable;
}
@@
-74,7
+75,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");
ret = -ENOTSUPP;
dev_err(&pdev->dev,
"IO mapped PCI devices are not supported\n");
- goto out_
release
;
+ goto out_
iounmap
;
}
pci_set_drvdata(pdev, priv);
}
pci_set_drvdata(pdev, priv);
@@
-89,7
+90,7
@@
static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ret = chameleon_parse_cells(priv->bus, priv->mapbase, priv->base);
if (ret < 0)
ret = chameleon_parse_cells(priv->bus, priv->mapbase, priv->base);
if (ret < 0)
- goto out_
iounmap
;
+ goto out_
mcb_bus
;
num_cells = ret;
dev_dbg(&pdev->dev, "Found %d cells\n", num_cells);
num_cells = ret;
dev_dbg(&pdev->dev, "Found %d cells\n", num_cells);
@@
-98,6
+99,8
@@
static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
return 0;
+out_mcb_bus:
+ mcb_release_bus(priv->bus);
out_iounmap:
iounmap(priv->base);
out_release:
out_iounmap:
iounmap(priv->base);
out_release: