diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 17:06:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 20:18:25 -0700 |
| commit | 5257a97a86766bdc3a976e3278b65367f35f9ff8 (patch) | |
| tree | 4c2f54480001df75745bdfbf9b9f1ccbe71a3199 /drivers/tty | |
| parent | ca43de58e5c35310fef81a64e0854615595935ee (diff) | |
| parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) | |
Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebase
This is the 3.10.12 stable release
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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 3396eb9d57a3..ac2767100df5 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)) |