projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
phy
/
mdio_bus.c
diff --git
a/drivers/net/phy/mdio_bus.c
b/drivers/net/phy/mdio_bus.c
index 8755d8cd41661a4251b75366a19f01c2cfc98b38..7a333601fbe88cf39adf9c2cfc07867f96f6708a 100644
(file)
--- 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;