diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
| commit | ed9d23700ee7847c354c0edd6d4da358bad48b7d (patch) | |
| tree | c6f164f4d3808b80999927b49553e4dc9fa80598 /drivers/tty | |
| parent | 72bce45fdecab65936f1e466c5c5107e48f8251e (diff) | |
| parent | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (diff) | |
| download | juno-ed9d23700ee7847c354c0edd6d4da358bad48b7d.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/tty')
| -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 3396eb9d57a..ac2767100df 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)) |