Subject: [PATCH] sky2: Make hw->ports the number of ports allocated

From: Mike McCormack <[email-masked]>
Date: Sat, 12 Sep 2009 12:19:23 +0900

If allocation of the second ports fails, make sure that hw->ports
 is not 2 otherwise we'll crash trying to access the second port.

Signed-off-by: Mike McCormack <[email-masked]>
---
 drivers/net/sky2.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 018aa58..c17ee26 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4563,6 +4563,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
 			free_netdev(dev1);
 		} else
 			sky2_show_addr(dev1);
+
+		/* couldn't allocate the second port */
+		if (!hw->dev[1])
+			--hw->ports;
 	}
 
 	setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);
-- 
1.5.6.5