aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-24 11:04:08 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-24 11:04:08 +0100
commit7645c4bfbb36f357f03815f5729c46ce8d89f008 (patch)
treeeb2c45bbdfc715a9a6e96e6af9675a0440ef8ff1 /drivers/net/phy
parent74b7ff48a93f44198ac03cc4e628d713f53d4668 (diff)
parent574f3c4f5c55e99ea60f71fd98cc54931d4b2eae (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/mdio_bus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 536bda1f428..289fc267edf 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;