diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
| commit | 0a52ac8d181e938d640c2da70cad6d1301abe775 (patch) | |
| tree | 046edf3437a49d3f6989d152bd94fcc80906b86d /drivers/net/fealnx.c | |
| parent | e81b795d44ba04beab7714de65ed2e377823bd37 (diff) | |
| parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/net/fealnx.c')
| -rw-r--r-- | drivers/net/fealnx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 48385c42ab5..160655d2458 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c @@ -584,7 +584,8 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, if (np->flags == HAS_MII_XCVR) { int phy, phy_idx = 0; - for (phy = 1; phy < 32 && phy_idx < 4; phy++) { + for (phy = 1; phy < 32 && phy_idx < ARRAY_SIZE(np->phys); + phy++) { int mii_status = mdio_read(dev, phy, 1); if (mii_status != 0xffff && mii_status != 0x0000) { |