Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179072
b: refs/heads/master
c: 29fb00e
h: refs/heads/master
v: v3
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed Dec 31, 2009
1 parent 268e057 commit 1b5d70d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f5cb43406d0b29b96248f5328a14a6f6abf8ae6
refs/heads/master: 29fb00e047eae927a3f1a0367c0cfed7ad5228ef
3 changes: 2 additions & 1 deletion trunk/drivers/net/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3607,6 +3607,7 @@ static int ucc_geth_suspend(struct of_device *ofdev, pm_message_t state)
if (!netif_running(ndev))
return 0;

netif_device_detach(ndev);
napi_disable(&ugeth->napi);

/*
Expand Down Expand Up @@ -3665,7 +3666,7 @@ static int ucc_geth_resume(struct of_device *ofdev)
phy_start(ugeth->phydev);

napi_enable(&ugeth->napi);
netif_start_queue(ndev);
netif_device_attach(ndev);

return 0;
}
Expand Down

0 comments on commit 1b5d70d

Please sign in to comment.