]> err.no Git - linux-2.6/commitdiff
[PATCH] skge: error handling on resume
authorStephen Hemminger <shemminger@osdl.org>
Thu, 15 Dec 2005 20:18:00 +0000 (12:18 -0800)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 24 Dec 2005 14:38:35 +0000 (09:38 -0500)
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>
drivers/net/skge.c

index e812dbb09c84c0db0e720e1f7993f2032e111043..b8dfe337313a5429a96f24846bc261216b279b13 100644 (file)
@@ -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;