diff --git a/[refs] b/[refs]
index cba047794d91..f92d0065d447 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 963bfeeeec913d135c15dc400f2f86cb62655d81
+refs/heads/master: 8cd47ea19bf8c6f9d3a41b3c312237d007138ae0
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index 069a03f717d3..9b137e14dbb0 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/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);