diff options
| author | Milosz Tanski <milosz@adfin.com> | 2013-09-06 16:41:20 +0000 |
|---|---|---|
| committer | Milosz Tanski <milosz@adfin.com> | 2013-09-06 16:41:20 +0000 |
| commit | cd0a2df681ec2af45f50c555c2a39dc92a4dff71 (patch) | |
| tree | 35d2278a9494582025f3dac08feb2266adef6a4d /drivers/tty | |
| parent | c35455791c1131e7ccbf56ea6fbdd562401c2ce2 (diff) | |
| parent | 5a6f282a2052bb13171b53f03b34501cf72c33f1 (diff) | |
| download | linux-cd0a2df681ec2af45f50c555c2a39dc92a4dff71.tar.bz2 | |
Merge tag 'fscache-fixes-for-ceph' into wip-fscache
Patches for Ceph FS-Cache support
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)) |