aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f2a4d399a6e5..8220c70534ed 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1174,8 +1174,15 @@ static int __devinit find_phy(struct device_node *np,
1174 struct device_node *phynode, *mdionode; 1174 struct device_node *phynode, *mdionode;
1175 struct resource res; 1175 struct resource res;
1176 int ret = 0, len; 1176 int ret = 0, len;
1177 const u32 *data;
1178
1179 data = of_get_property(np, "fixed-link", NULL);
1180 if (data) {
1181 snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
1182 return 0;
1183 }
1177 1184
1178 const u32 *data = of_get_property(np, "phy-handle", &len); 1185 data = of_get_property(np, "phy-handle", &len);
1179 if (!data || len != 4) 1186 if (!data || len != 4)
1180 return -EINVAL; 1187 return -EINVAL;
1181 1188