diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /drivers/net/phy/mdio_bus.c | |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff) | |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff) | |
| download | talos-obmc-linux-bf8bd66d0580f296f257d371ee41a0a137b541c7.tar.gz talos-obmc-linux-bf8bd66d0580f296f257d371ee41a0a137b541c7.zip | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
| -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 536bda1f428b..289fc267edf3 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; |
