From: Kevin Hao Date: Fri, 2 Jan 2009 13:44:34 +0000 (+0000) Subject: Add device function for USB serial console X-Git-Tag: v2.6.29-rc1~545^2~47 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=39efd191d01b5f1efc3d604baf74233dc525e6a8;p=~shefty%2Frdma-dev.git Add device function for USB serial console Add device funtion for usb serial console, so we can open /dev/console when we use a usb serial device as console. (Typecast removed as noted by Sergei Shtylyov) Signed-off-by: Kevin Hao Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index 5b95009d2fb..19e24045b13 100644 --- a/drivers/usb/serial/console.c +++ b/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)