Merge commit 'v2.6.34-rc6' into core/locking

[karo-tx-linux.git] / drivers / usb / serial / console.c

diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index b22ac3258523af80e46a63fd0660117e51232553..f347da2ef00a04c6c8a875e54657c1eb5c87edb4 100644 (file)
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -181,6 +181,7 @@ static int usb_console_setup(struct console *co, char *options)
        /* The console is special in terms of closing the device so
         * indicate this port is now acting as a system console. */
        port->console = 1;
+       port->port.console = 1;
 
        mutex_unlock(&serial->disc_mutex);
        return retval;