lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

Browse Source
This commit is contained in:
Paul Mackerras
2008-01-24 15:29:14 +11:00
parent 9156ad4833 96f39c1718
commit dcb571be20
106 changed files with 9537 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/fs_enet/fs_enet-main.c
View File

@ -1178,8 +1178,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;
const u32 *data = of_get_property(np, "phy-handle", &len);
data = of_get_property(np, "fixed-link", NULL);
if (data) {
snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
return 0;
}
data = of_get_property(np, "phy-handle", &len);
if (!data || len != 4)
return -EINVAL;