From 08fd482bf8cd9c19f5bc1c702a253bfcb14e179d Mon Sep 17 00:00:00 2001
From: Kevin Hao <kexin.hao@windriver.com>
Date: Fri, 2 Jan 2009 13:44:34 +0000
Subject: [PATCH] --- yaml --- r: 125046 b: refs/heads/master c:
 39efd191d01b5f1efc3d604baf74233dc525e6a8 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/serial/console.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8849871d6a89..647c21ecae60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 975a1a7d887048d4afc9201383e11b7af991866b
+refs/heads/master: 39efd191d01b5f1efc3d604baf74233dc525e6a8
diff --git a/trunk/drivers/usb/serial/console.c b/trunk/drivers/usb/serial/console.c
index 5b95009d2fbb..19e24045b137 100644
--- a/trunk/drivers/usb/serial/console.c
+++ b/trunk/drivers/usb/serial/console.c
@@ -241,12 +241,25 @@ static void usb_console_write(struct console *co,
 	}
 }
 
+static struct tty_driver *usb_console_device(struct console *co, int *index)
+{
+	struct tty_driver **p = (struct tty_driver **)co->data;
+
+	if (!*p)
+		return NULL;
+
+	*index = co->index;
+	return *p;
+}
+
 static struct console usbcons = {
 	.name =		"ttyUSB",
 	.write =	usb_console_write,
+	.device =	usb_console_device,
 	.setup =	usb_console_setup,
 	.flags =	CON_PRINTBUFFER,
 	.index =	-1,
+	.data = 	&usb_serial_tty_driver,
 };
 
 void usb_serial_console_disconnect(struct usb_serial *serial)