projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
phy
/
mdio_bus.c
diff --git
a/drivers/net/phy/mdio_bus.c
b/drivers/net/phy/mdio_bus.c
index
459443b
..
1b236bd
100644
(file)
--- a/
drivers/net/phy/mdio_bus.c
+++ b/
drivers/net/phy/mdio_bus.c
@@
-60,8
+60,10
@@
int mdiobus_register(struct mii_bus *bus)
for (i = 0; i < PHY_MAX_ADDR; i++) {
struct phy_device *phydev;
- if (bus->phy_mask & (1 << i))
+ if (bus->phy_mask & (1 << i)) {
+ bus->phy_map[i] = NULL;
continue;
+ }
phydev = get_phy_device(bus, i);