projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bcm63xx_enet.c
diff --git
a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index
ae364c7
..
5370909
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/
drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@
-1126,7
+1126,8
@@
out_freeirq:
free_irq(dev->irq, dev);
out_phy_disconnect:
- phy_disconnect(phydev);
+ if (priv->has_phy)
+ phy_disconnect(phydev);
return ret;
}