From c519a018912c5c494ba605e0a599cf21c4e86c8d Mon Sep 17 00:00:00 2001 From: Jochen Friedrich Date: Tue, 18 Dec 2007 16:25:43 +0100 Subject: [PATCH] --- yaml --- r: 81314 b: refs/heads/master c: 70f782e14870435aa37b91e1ea0a189a78eb0fa9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/fs_enet/fs_enet-main.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54d803466b91..55eb4a47b345 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6869e4ad4bd17e7699e58bed6464738e8677c392 +refs/heads/master: 70f782e14870435aa37b91e1ea0a189a78eb0fa9 diff --git a/trunk/drivers/net/fs_enet/fs_enet-main.c b/trunk/drivers/net/fs_enet/fs_enet-main.c index f2a4d399a6e5..8220c70534ed 100644 --- a/trunk/drivers/net/fs_enet/fs_enet-main.c +++ b/trunk/drivers/net/fs_enet/fs_enet-main.c @@ -1174,8 +1174,15 @@ static int __devinit find_phy(struct device_node *np, struct device_node *phynode, *mdionode; struct resource res; int ret = 0, len; + const u32 *data; + + data = of_get_property(np, "fixed-link", NULL); + if (data) { + snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data); + return 0; + } - const u32 *data = of_get_property(np, "phy-handle", &len); + data = of_get_property(np, "phy-handle", &len); if (!data || len != 4) return -EINVAL;