diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2005-12-15 12:18:00 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:38:35 -0500 |
| commit | edd702e847fb8a9774a2ed8d50d2b8299b8c7f89 (patch) | |
| tree | 3abf9920526b65889aa8216742d85ee3d0e39cba /drivers/net/skge.c | |
| parent | [PATCH] spidernet: fix Kconfig after BPA->CELL rename (diff) | |
| download | linux-dev-edd702e847fb8a9774a2ed8d50d2b8299b8c7f89.tar.xz linux-dev-edd702e847fb8a9774a2ed8d50d2b8299b8c7f89.zip | |
[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/skge.c')
| -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) 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; |