projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-drm-fsl-dcu.git]
/
drivers
/
net
/
ethernet
/
aeroflex
/
greth.c
diff --git
a/drivers/net/ethernet/aeroflex/greth.c
b/drivers/net/ethernet/aeroflex/greth.c
index e0669455514458705fc5a321b1a82efb13891c2c..b20cbf0323e0ff4f87e852da3679002757862d39 100644
(file)
--- a/
drivers/net/ethernet/aeroflex/greth.c
+++ b/
drivers/net/ethernet/aeroflex/greth.c
@@
-1361,7
+1361,7
@@
static int greth_mdio_init(struct greth_private *greth)
timeout = jiffies + 6*HZ;
while (!phy_aneg_done(greth->phy) && time_before(jiffies, timeout)) {
}
-
gen
phy_read_status(greth->phy);
+ phy_read_status(greth->phy);
greth_link_change(greth->netdev);
}