projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46d7274
)
phylib: reset mii bus only if reset handler is registered
author
Vladimir Zapolskiy
<vz@mleia.com>
Mon, 5 Sep 2011 07:24:07 +0000
(07:24 +0000)
committer
Wolfgang Denk
<wd@denx.de>
Fri, 9 Sep 2011 22:07:55 +0000
(
00:07
+0200)
This change allows to cope with a mii bus device registered using
miiphy_register(), which doesn't assign a default reset handler.
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Detlev Zundel <dzu@denx.de>
drivers/net/phy/phy.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/phy.c
b/drivers/net/phy/phy.c
index ce69c195368c045f5b2f02acc93be47710ee627a..8da7688d704e529c7869b7db682f4c03b8ecd414 100644
(file)
--- a/
drivers/net/phy/phy.c
+++ b/
drivers/net/phy/phy.c
@@
-692,7
+692,8
@@
struct phy_device *phy_connect(struct mii_dev *bus, int addr,
struct phy_device *phydev;
/* Reset the bus */
- bus->reset(bus);
+ if (bus->reset)
+ bus->reset(bus);
/* Wait 15ms to make sure the PHY has come out of hard reset */
udelay(15000);