mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
3c59x: handle pci_iomap() errors
pci_iomap() can fail, handle this case and return -ENOMEM from probe function. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
963bfeeeec
commit
8cd47ea19b
@ -1020,6 +1020,11 @@ static int __devinit vortex_init_one(struct pci_dev *pdev,
|
|||||||
ioaddr = pci_iomap(pdev, pci_bar, 0);
|
ioaddr = pci_iomap(pdev, pci_bar, 0);
|
||||||
if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */
|
if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */
|
||||||
ioaddr = pci_iomap(pdev, 0, 0);
|
ioaddr = pci_iomap(pdev, 0, 0);
|
||||||
|
if (!ioaddr) {
|
||||||
|
pci_disable_device(pdev);
|
||||||
|
rc = -ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq,
|
rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq,
|
||||||
ent->driver_data, unit);
|
ent->driver_data, unit);
|
||||||
|
Loading…
Reference in New Issue
Block a user