aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 11:17:32 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 11:17:32 +1000
commit10420921675582903ab256dc3094206ac0280f68 (patch)
treeb774e849efa85255b2fbc0a24698c75196038e96 /drivers/tty
parent13906db670a128864714c30c244b866dce119494 (diff)
parentd220980b701d838560a70de691b53be007e99e78 (diff)
Merge branch 'merge' into next
Merge recent fixes to lparcfg so subsequent patches can move the whole file to arch/powerpc/platforms/pseries
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/hvc/hvsi_lib.c4
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))