From mboxrd@z Thu Jan 1 00:00:00 1970 From: Atin Malaviya Date: Tue, 3 Feb 2009 08:01:02 -0500 Subject: [U-Boot] [PATCH] usbtty: Added additional usbtty_configured() checks to get around hang when usb is not connected but multi-io is set up. Message-ID: <20090203130102.GA8008@thor> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This adds additional checks in usbtty_puts() and usbtty_putc() to get around a hang when usb is not connected but multi-io (setenv stdout serial,usbtty etc) is set up by the user. We hang because the buffers get full because usb isn't connected. --- drivers/serial/usbtty.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 7eba470..0e4e17d 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -433,6 +433,9 @@ int usbtty_getc (void) */ void usbtty_putc (const char c) { + if (!usbtty_configured ()) + return; + buf_push (&usbtty_output, &c, 1); /* If \n, also do \r */ if (c == '\n') @@ -486,8 +489,12 @@ static void __usbtty_puts (const char *str, int len) void usbtty_puts (const char *str) { int n; - int len = strlen (str); + int len; + + if (!usbtty_configured ()) + return; + len = strlen (str); /* add '\r' for each '\n' */ while (len > 0) { n = next_nl_pos (str); -- 1.5.6.3