Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvsi_lib.c

diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
index 3396eb9d57a374770f22dd956d06fa3382196f66..ac2767100df56d3ef071f565ddfc7f4063432ca7 100644 (file)
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -341,8 +341,8 @@ void hvsilib_establish(struct hvsi_priv *pv)
 
        pr_devel("HVSI@%x:   ... waiting handshake\n", pv->termno);
 
-       /* Try for up to 200s */
-       for (timeout = 0; timeout < 20; timeout++) {
+       /* Try for up to 400ms */
+       for (timeout = 0; timeout < 40; timeout++) {
                if (pv->established)
                        goto established;
                if (!hvsi_get_packet(pv))