brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 08:00:26 +09:00
Code Issues Projects Releases Wiki Activity

fix lockup in mcfmii/mii_discover_phy() in case communication fails

Browse Source 
Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Wolfgang Wegner 2010-04-06 11:13:02 +02:00 committed by Ben Warren
parent 23c34af48f
commit 33f684d6d5
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/mcfmii.c
View File

@ -175,39 +175,40 @@ int mii_discover_phy(struct eth_device *dev)
#ifdef ET_DEBUG #ifdef ET_DEBUG
printf("PHY type 0x%x pass %d type\n", phytype, pass); printf("PHY type 0x%x pass %d type\n", phytype, pass);
#endif #endif
if (phytype != 0xffff) { if (phytype == 0xffff)
phyaddr = phyno; continue;
phytype <<= 16; phyaddr = phyno;
phytype |= phytype <<= 16;
mii_send(mk_mii_read(phyno, PHY_PHYIDR2)); phytype |=
mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
#ifdef ET_DEBUG #ifdef ET_DEBUG
printf("PHY @ 0x%x pass %d\n", phyno, pass); printf("PHY @ 0x%x pass %d\n", phyno, pass);
#endif #endif
for (i = 0; i < (sizeof(phyinfo) / sizeof(phy_info_t)); i++) { for (i = 0; (i < (sizeof(phyinfo) / sizeof(phy_info_t)))
if (phyinfo[i].phyid == phytype) { && (phyinfo[i].phyid != 0); i++) {
if (phyinfo[i].phyid == phytype) {
#ifdef ET_DEBUG #ifdef ET_DEBUG
printf("phyid %x - %s\n", printf("phyid %x - %s\n",
phyinfo[i].phyid, phyinfo[i].phyid,
phyinfo[i].strid); phyinfo[i].strid);
#endif #endif
strcpy(info->phy_name, phyinfo[i].strid); strcpy(info->phy_name, phyinfo[i].strid);
info->phyname_init = 1;
found = 1;
break;
}
}
if (!found) {
#ifdef ET_DEBUG
printf("0x%08x\n", phytype);
#endif
strcpy(info->phy_name, "unknown");
info->phyname_init = 1; info->phyname_init = 1;
found = 1;
break; break;
} }
} }
if (!found) {
#ifdef ET_DEBUG
printf("0x%08x\n", phytype);
#endif
strcpy(info->phy_name, "unknown");
info->phyname_init = 1;
break;
}
} }
} }