diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-24 01:56:23 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-24 01:56:23 (GMT) |
commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/phy | |
parent | 908a7a16b852ffd618a9127be8d62432182d81b4 (diff) | |
parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff) | |
download | linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
Diffstat (limited to 'drivers/net/phy')
-rw-r--r-- | drivers/net/phy/mdio_bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 8755d8c..7a33360 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus) return -EINVAL; } - bus->state = MDIOBUS_REGISTERED; - mutex_init(&bus->mdio_lock); if (bus->reset) @@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus) } } + if (!err) + bus->state = MDIOBUS_REGISTERED; + pr_info("%s: probed\n", bus->name); return err; |