Commit 3ca71bf9 authored by Russell King's avatar Russell King

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

parent 6c37a6ba
...@@ -2003,7 +2003,6 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state, ...@@ -2003,7 +2003,6 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state,
state->port = port; state->port = port;
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
port->type = PORT_UNKNOWN;
port->cons = drv->cons; port->cons = drv->cons;
port->info = state->info; port->info = state->info;
...@@ -2020,8 +2019,10 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state, ...@@ -2020,8 +2019,10 @@ __uart_register_port(struct uart_driver *drv, struct uart_state *state,
flags = UART_CONFIG_TYPE; flags = UART_CONFIG_TYPE;
if (port->flags & UPF_AUTO_IRQ) if (port->flags & UPF_AUTO_IRQ)
flags |= UART_CONFIG_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); port->ops->config_port(port, flags);
}
/* /*
* Register the port whether it's detected or not. This allows * Register the port whether it's detected or not. This allows
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment