diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2005-12-15 15:18:00 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:38:35 -0500 |
commit | edd702e847fb8a9774a2ed8d50d2b8299b8c7f89 (patch) | |
tree | 3abf9920526b65889aa8216742d85ee3d0e39cba /drivers/net | |
parent | b35de2eb389aa1889941ec3d02fff6d7a2569825 (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/skge.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
3416 | struct net_device *dev = hw->dev[i]; | 3416 | struct net_device *dev = hw->dev[i]; |
3417 | if (dev) { | 3417 | if (dev) { |
3418 | netif_device_attach(dev); | 3418 | netif_device_attach(dev); |
3419 | if (netif_running(dev)) | 3419 | if (netif_running(dev) && skge_up(dev)) |
3420 | skge_up(dev); | 3420 | dev_close(dev); |
3421 | } | 3421 | } |
3422 | } | 3422 | } |
3423 | return 0; | 3423 | return 0; |