diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-27 21:17:32 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-27 21:17:32 -0400 |
| commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
| tree | b774e849efa85255b2fbc0a24698c75196038e96 /drivers/tty/hvc | |
| parent | 13906db670a128864714c30c244b866dce119494 (diff) | |
| parent | d220980b701d838560a70de691b53be007e99e78 (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/hvc')
| -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) | |||
| 341 | 341 | ||
| 342 | pr_devel("HVSI@%x: ... waiting handshake\n", pv->termno); | 342 | pr_devel("HVSI@%x: ... waiting handshake\n", pv->termno); |
| 343 | 343 | ||
| 344 | /* Try for up to 200s */ | 344 | /* Try for up to 400ms */ |
| 345 | for (timeout = 0; timeout < 20; timeout++) { | 345 | for (timeout = 0; timeout < 40; timeout++) { |
| 346 | if (pv->established) | 346 | if (pv->established) |
| 347 | goto established; | 347 | goto established; |
| 348 | if (!hvsi_get_packet(pv)) | 348 | if (!hvsi_get_packet(pv)) |