git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: stmmac: don't attach interface until resume finishes
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
stmmac_main.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a999d6b33a645ed565602b9d318284c229badfb1..1f319c9cee468aca92198a35abb4f3035837d468 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@
-5190,8
+5190,6
@@
int stmmac_resume(struct device *dev)
return ret;
}
- netif_device_attach(ndev);
-
mutex_lock(&priv->lock);
stmmac_reset_queues_param(priv);
@@
-5218,6
+5216,8
@@
int stmmac_resume(struct device *dev)
phylink_mac_change(priv->phylink, true);
+ netif_device_attach(ndev);
+
return 0;
}
EXPORT_SYMBOL_GPL(stmmac_resume);