projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1d88e5
)
forcedeth: Fix resume from hibernation regression.
author
Ed Swierk
<eswierk@aristanetworks.com>
Tue, 7 Apr 2009 00:49:12 +0000
(17:49 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 7 Apr 2009 00:49:12 +0000
(17:49 -0700)
Reset phy state on resume, fixing a regression caused by powering down
the phy on hibernate.
Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/forcedeth.c
patch
|
blob
|
history
diff --git
a/drivers/net/forcedeth.c
b/drivers/net/forcedeth.c
index
a858c6f
..
663a7b3
100644
(file)
--- a/
drivers/net/forcedeth.c
+++ b/
drivers/net/forcedeth.c
@@
-6117,6
+6117,9
@@
static int nv_resume(struct pci_dev *pdev)
pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
+ /* restore phy state, including autoneg */
+ phy_init(dev);
+
netif_device_attach(dev);
if (netif_running(dev)) {
rc = nv_open(dev);