diff options
| author | Benjamin Herrenschmidt | 2013-08-28 03:17:32 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2013-08-28 03:17:32 +0200 |
| commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
| tree | b774e849efa85255b2fbc0a24698c75196038e96 /drivers/tty/hvc | |
| parent | powerpc/powernv: Return secondary CPUs to firmware on kexec (diff) | |
| parent | powerpc/hvsi: Increase handshake timeout from 200ms to 400ms. (diff) | |
| download | kernel-qcow2-linux-10420921675582903ab256dc3094206ac0280f68.tar.gz kernel-qcow2-linux-10420921675582903ab256dc3094206ac0280f68.tar.xz kernel-qcow2-linux-10420921675582903ab256dc3094206ac0280f68.zip | |
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) 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)) |