From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 15 Dec 2005 20:18:00 +0000 (-0800)
Subject: [PATCH] skge: error handling on resume
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd702e847fb8a9774a2ed8d50d2b8299b8c7f89;p=pandora-kernel.git

[PATCH] skge: error handling on resume

Also have to handle out of memory condition on resume.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index e812dbb09c84..b8dfe337313a 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3416,8 +3416,8 @@ static int skge_resume(struct pci_dev *pdev)
 		struct net_device *dev = hw->dev[i];
 		if (dev) {
 			netif_device_attach(dev);
-			if (netif_running(dev))
-				skge_up(dev);
+			if (netif_running(dev) && skge_up(dev))
+				dev_close(dev);
 		}
 	}
 	return 0;