diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
commit | efa4d684d8927428d333f841e37adeedcfe61cfb (patch) | |
tree | 5c780a94fdfa9557da018a485d7fe884244aaf48 /commands/miitool.c | |
parent | 45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff) | |
parent | 10d63913999fbd5c02a2a8daecf877c24663bdca (diff) | |
download | barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.xz |
Merge branch 'for-next/misc'
Conflicts:
arch/arm/boards/chumby_falconwing/falconwing.c
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
arch/x86/mach-x86.dox
scripts/setupmbr/setupmbr.c
Diffstat (limited to 'commands/miitool.c')
-rw-r--r-- | commands/miitool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/commands/miitool.c b/commands/miitool.c index 40e34e93cc..c62e7588a8 100644 --- a/commands/miitool.c +++ b/commands/miitool.c @@ -115,14 +115,14 @@ static int show_basic_mii(struct mii_bus *mii, struct phy_device *phydev, for (i = 0; i < 32; i++) mii_val[i] = mii->read(mii, phydev->addr, i); + printf("%s: %s%d: ", phydev->cdev.name, + mii->parent->name, mii->parent->id); + if (mii_val[MII_BMCR] == 0xffff || mii_val[MII_BMSR] == 0x0000) { fprintf(stderr, " No MII transceiver present!.\n"); return -1; } - printf("%s: %s%d: ", phydev->cdev.name, - mii->parent->name, mii->parent->id); - /* Descriptive rename. */ bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR]; |