From: Kulikov Vasiliy <segooon@gmail.com>
Date: Wed, 21 Jul 2010 02:00:36 +0000 (+0000)
Subject: 3c59x: handle pci_iomap() errors
X-Git-Tag: v2.6.36-rc1~571^2~137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cd47ea19bf8c6f9d3a41b3c312237d007138ae0;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 069a03f..9b137e1 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1020,6 +1020,11 @@ static int __devinit vortex_init_one(struct pci_dev *pdev,
 	ioaddr = pci_iomap(pdev, pci_bar, 0);
 	if (!ioaddr) /* If mapping fails, fall-back to BAR 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,
 			   ent->driver_data, unit);