1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index 36e3bcb1ebf0..7633132a10aa 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -477,6 +477,13 @@ static int __init mux_probe(struct parisc_device *dev)
                 port->ops       = &mux_pops;
                 port->flags     = UPF_BOOT_AUTOCONF;
                 port->line      = port_cnt;
+
+                /* The port->timeout needs to match what is present in
+                 * uart_wait_until_sent in serial_core.c.  Otherwise
+                 * the time spent in msleep_interruptable will be very
+                 * long, causing the appearance of a console hang.
+                 */
+                port->timeout   = HZ / 50;
                 spin_lock_init(&port->lock);
                 status = uart_add_one_port(&mux_driver, port);
                 BUG_ON(status);