---

yaml --- r: 125046 b: refs/heads/master c: 39efd19 h: refs/heads/master v: v3
git-mirror · Jan 2, 2009 · 08fd482 · 08fd482
1 parent 0d9a062
commit 08fd482
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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)