[SERIAL] Set port->type to unknown only when using autoconfig

diff --git a/drivers/serial/core.c b/drivers/serial/core.c
index dc7a21ebfc3bf32d07082d0c9f128d51a0798898..2229e6d938c41ba51c969e1b77eab13f246136da 100644 (file)
--- a/drivers/serial/core.c
+++ b/drivers/serial/core.c
@@ -2003,7 +2003,6 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state,
        state->port = port;
 
        spin_lock_init(&port->lock);
-       port->type = PORT_UNKNOWN;
        port->cons = drv->cons;
        port->info = state->info;
 
@@ -2020,8 +2019,10 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state,
        flags = UART_CONFIG_TYPE;
        if (port->flags & UPF_AUTO_IRQ)
                flags |= UART_CONFIG_IRQ;
-       if (port->flags & UPF_BOOT_AUTOCONF)
+       if (port->flags & UPF_BOOT_AUTOCONF) {
+               port->type = PORT_UNKNOWN;
                port->ops->config_port(port, flags);
+       }
 
        /*
         * Register the port whether it's detected or not.  This allows