
5 Sep
2011
5 Sep
'11
7:24 p.m.
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 --- drivers/net/phy/phy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ce69c19..8da7688 100644 --- 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);
--
1.7.5.4