Commit 3dd332c5 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: 68328serial, fix compilation

tty_struct->termios is no longer a pointer. This was changed recently
by "tty: move the termios object into the tty". But 68328serial was
not changed, so we now have a compilation error:
68328serial.c: In function 'change_speed':
68328serial.c:518:22: error: invalid type argument of '->' (have 'struct ktermios')
68328serial.c: In function 'rs_set_ldisc':
68328serial.c:620:31: error: invalid type argument of '->' (have 'struct ktermios')
68328serial.c: In function 'rs_set_termios':
68328serial.c:988:20: error: invalid type argument of '->' (have 'struct ktermios')

Fix that now.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f9ea7ad
...@@ -515,7 +515,7 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty) ...@@ -515,7 +515,7 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
unsigned cflag; unsigned cflag;
int i; int i;
cflag = tty->termios->c_cflag; cflag = tty->termios.c_cflag;
if (!(port = info->port)) if (!(port = info->port))
return; return;
...@@ -617,7 +617,7 @@ static void rs_set_ldisc(struct tty_struct *tty) ...@@ -617,7 +617,7 @@ static void rs_set_ldisc(struct tty_struct *tty)
if (serial_paranoia_check(info, tty->name, "rs_set_ldisc")) if (serial_paranoia_check(info, tty->name, "rs_set_ldisc"))
return; return;
info->is_cons = (tty->termios->c_line == N_TTY); info->is_cons = (tty->termios.c_line == N_TTY);
printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off"); printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off");
} }
...@@ -985,7 +985,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) ...@@ -985,7 +985,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
change_speed(info, tty); change_speed(info, tty);
if ((old_termios->c_cflag & CRTSCTS) && if ((old_termios->c_cflag & CRTSCTS) &&
!(tty->termios->c_cflag & CRTSCTS)) { !(tty->termios.c_cflag & CRTSCTS)) {
tty->hw_stopped = 0; tty->hw_stopped = 0;
rs_start(tty); rs_start(tty);
} }
...@@ -1070,7 +1070,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -1070,7 +1070,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
if (tty->ldisc.close) if (tty->ldisc.close)
(tty->ldisc.close)(tty); (tty->ldisc.close)(tty);
tty->ldisc = ldiscs[N_TTY]; tty->ldisc = ldiscs[N_TTY];
tty->termios->c_line = N_TTY; tty->termios.c_line = N_TTY;
if (tty->ldisc.open) if (tty->ldisc.open)
(tty->ldisc.open)(tty); (tty->ldisc.open)(tty);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment