2 files changed, 18 insertions, 0 deletions

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 78036c510ccc..0fcfd98a9566 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2129,6 +2129,7 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
+        int ret;
 
         if (!state || !state->uart_port)
                 return -1;
@@ -2137,6 +2138,22 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
         if (!(port->ops->poll_get_char && port->ops->poll_put_char))
                 return -1;
 
+        if (port->ops->poll_init) {
+                struct tty_port *tport = &state->port;
+
+                ret = 0;
+                mutex_lock(&tport->mutex);
+                /*
+                 * We don't set ASYNCB_INITIALIZED as we only initialized the
+                 * hw, e.g. state->xmit is still uninitialized.
+                 */
+                if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
+                        ret = port->ops->poll_init(port);
+                mutex_unlock(&tport->mutex);
+                if (ret)
+                        return ret;
+        }
+
         if (options) {
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
                 return uart_set_options(port, NULL, baud, parity, bits, flow);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index bb010030828a..f9b22ec7a9f3 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -275,6 +275,7 @@ struct uart_ops {
         int             (*verify_port)(struct uart_port *, struct serial_struct *);
         int             (*ioctl)(struct uart_port *, unsigned int, unsigned long);
 #ifdef CONFIG_CONSOLE_POLL
+        int             (*poll_init)(struct uart_port *);
         void    (*poll_put_char)(struct uart_port *, unsigned char);
         int             (*poll_get_char)(struct uart_port *);
 #endif