Serial: Allow port type to be specified when calling serial8250_register_port.

[linux-2.6-omap-h63xx.git] / drivers / serial / serial_core.c

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 9425ed69e0f7cb3f354463e15105ef99363efe5b..dc68b7e0c93049d9fe360b587fafe5a94230bfea 100644 (file)
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2179,11 +2179,14 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
         * Now do the auto configuration stuff.  Note that config_port
         * is expected to claim the resources and map the port for us.
         */
-       flags = UART_CONFIG_TYPE;
+       flags = 0;
        if (port->flags & UPF_AUTO_IRQ)
                flags |= UART_CONFIG_IRQ;
        if (port->flags & UPF_BOOT_AUTOCONF) {
-               port->type = PORT_UNKNOWN;
+               if (!(port->flags & UPF_FIXED_TYPE)) {
+                       port->type = PORT_UNKNOWN;
+                       flags |= UART_CONFIG_TYPE;
+               }
                port->ops->config_port(port, flags);
        }