diff --git a/[refs] b/[refs] index 45c3988d0ad7..b06eac202859 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b35de2eb389aa1889941ec3d02fff6d7a2569825 +refs/heads/master: edd702e847fb8a9774a2ed8d50d2b8299b8c7f89 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index e812dbb09c84..b8dfe337313a 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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;