diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-08-22 10:17:59 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-08-22 10:17:59 -0500 |
| commit | 4b7576fb804f9aae275a9ad5d947d2eb727d8cb7 (patch) | |
| tree | 56a964216b21901d6279069086f713170805864f /common | |
| parent | 5de62c47a8628b3da4d73f7c07027f32a3342d40 (diff) | |
| parent | 5196a7a03bc436435787e1ad7044af94d93a5448 (diff) | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_mii.c | 4 | ||||
| -rw-r--r-- | common/main.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/common/cmd_mii.c b/common/cmd_mii.c index ee5e43ee8..e6595360c 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -117,8 +117,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) miiphy_speed (devname, j), (miiphy_duplex (devname, j) == FULL) ? "FDX" : "HDX"); - } else { - puts ("Error reading info from the PHY\n"); } } } else if (op == 'r') { @@ -503,8 +501,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) miiphy_speed (devname, j), (miiphy_duplex (devname, j) == FULL) ? "FDX" : "HDX"); - } else { - puts ("Error reading info from the PHY\n"); } } } else if (op[0] == 'r') { diff --git a/common/main.c b/common/main.c index 3788bd5e4..13d12a430 100644 --- a/common/main.c +++ b/common/main.c @@ -937,6 +937,7 @@ int readline (const char *const prompt) #ifdef CONFIG_CMDLINE_EDITING char *p = console_buffer; unsigned int len=MAX_CMDBUF_SIZE; + int rc; static int initted = 0; if (!initted) { @@ -946,8 +947,8 @@ int readline (const char *const prompt) puts (prompt); - cread_line(p, &len); - return len; + rc = cread_line(p, &len); + return rc < 0 ? rc : len; #else char *p = console_buffer; int n = 0; /* buffer index */ |