diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-09-13 13:38:42 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-09-13 13:38:42 -0400 |
| commit | b05f01b32d39f960407c2fbc56244d14b9ff19a5 (patch) | |
| tree | acd42e1b88857758187de2a50e4b9767cb4a8224 /drivers/tty/hvc/hvsi_lib.c | |
| parent | 70c67d3efde6ef4fa2fae0ba7fac3aaf011a1385 (diff) | |
| parent | 8514c7d8607cd8b6da39187d12fd00e874fa8388 (diff) | |
Merge tag 'v3.6.11.9' into v3.6-rt
Conflicts:
arch/arm/kernel/process.c
kernel/hrtimer.c
Diffstat (limited to 'drivers/tty/hvc/hvsi_lib.c')
| -rw-r--r-- | drivers/tty/hvc/hvsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c index 59c135dd5d20..2c51419bd40a 100644 --- 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)) |