From 725aec71627da5aea5487e641d8a95567b59ea90 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Wed, 23 Sep 2009 03:50:36 +0000
Subject: [PATCH] --- yaml --- r: 166701 b: refs/heads/master c:
 f1914226e12044f0cacda59efc91bee972c30341 h: refs/heads/master i:   166699:
 e13eefd2c574214f8c293ba65353450e92cae4d6 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/skge.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e1e7203e1a7f..23d5b5536b6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec1652af18ef02c7c6ceeabb64f56f16eaf40ae9
+refs/heads/master: f1914226e12044f0cacda59efc91bee972c30341
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index 55bad4081966..2bb21ffbde3a 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -3982,14 +3982,17 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 	}
 	skge_show_addr(dev);
 
-	if (hw->ports > 1 && (dev1 = skge_devinit(hw, 1, using_dac))) {
-		if (register_netdev(dev1) == 0)
+	if (hw->ports > 1) {
+		dev1 = skge_devinit(hw, 1, using_dac);
+		if (dev1 && register_netdev(dev1) == 0)
 			skge_show_addr(dev1);
 		else {
 			/* Failure to register second port need not be fatal */
 			dev_warn(&pdev->dev, "register of second port failed\n");
 			hw->dev[1] = NULL;
-			free_netdev(dev1);
+			hw->ports = 1;
+			if (dev1)
+				free_netdev(dev1);
 		}
 	}
 	pci_set_drvdata(pdev, hw);