Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / phy / mdio_bus.c

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6e9f619c491f74837a7f356943683094169e28bf..94e0b7ed76f16ff8c2c2a7f43aaf341c4cace12d 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -49,13 +49,13 @@ int mdiobus_register(struct mii_bus *bus)
        int i;
        int err = 0;
 
-       mutex_init(&bus->mdio_lock);
-
        if (NULL == bus || NULL == bus->name ||
                        NULL == bus->read ||
                        NULL == bus->write)
                return -EINVAL;
 
+       mutex_init(&bus->mdio_lock);
+
        if (bus->reset)
                bus->reset(bus);
 
@@ -89,6 +89,9 @@ int mdiobus_register(struct mii_bus *bus)
 
                        phydev->bus = bus;
 
+                       /* Run all of the fixups for this PHY */
+                       phy_scan_fixups(phydev);
+
                        err = device_register(&phydev->dev);
 
                        if (err) {