summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2012-07-20 14:58:31 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-10 12:39:59 -0700
commit2d8a1001ee0e961a00ab460ff54ea9a321a56d2e (patch)
treef56474aac90f5dc74b1b03362d44799e4f05d000
parentc87985a3ce723995fc7b25e598238d67154108a1 (diff)
downloadblackbird-op-linux-2d8a1001ee0e961a00ab460ff54ea9a321a56d2e.tar.gz
blackbird-op-linux-2d8a1001ee0e961a00ab460ff54ea9a321a56d2e.zip
tty: fix up usb serial console for termios change.
fixes these errors: drivers/usb/serial/console.c: In function 'usb_console_setup': drivers/usb/serial/console.c:168:16: error: invalid type argument of '->' (have 'struct ktermios') drivers/usb/serial/console.c:169:4: error: incompatible type for argument 1 of 'tty_termios_encode_baud_rate' include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argument is of type 'struct ktermios' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index b9cca6dcde07..9a564286bfd7 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -165,8 +165,8 @@ static int usb_console_setup(struct console *co, char *options)
}
if (serial->type->set_termios) {
- tty->termios->c_cflag = cflag;
- tty_termios_encode_baud_rate(tty->termios, baud, baud);
+ tty->termios.c_cflag = cflag;
+ tty_termios_encode_baud_rate(&tty->termios, baud, baud);
memset(&dummy, 0, sizeof(struct ktermios));
serial->type->set_termios(tty, port, &dummy);
OpenPOWER on IntegriCloud