diff options
Diffstat (limited to 'drivers/char/synclinkmp.c')
-rw-r--r-- | drivers/char/synclinkmp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 20a96ef250be..53e8ccf94fe3 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -519,7 +519,7 @@ static struct tty_driver *serial_driver; | |||
519 | static int open(struct tty_struct *tty, struct file * filp); | 519 | static int open(struct tty_struct *tty, struct file * filp); |
520 | static void close(struct tty_struct *tty, struct file * filp); | 520 | static void close(struct tty_struct *tty, struct file * filp); |
521 | static void hangup(struct tty_struct *tty); | 521 | static void hangup(struct tty_struct *tty); |
522 | static void set_termios(struct tty_struct *tty, struct termios *old_termios); | 522 | static void set_termios(struct tty_struct *tty, struct ktermios *old_termios); |
523 | 523 | ||
524 | static int write(struct tty_struct *tty, const unsigned char *buf, int count); | 524 | static int write(struct tty_struct *tty, const unsigned char *buf, int count); |
525 | static void put_char(struct tty_struct *tty, unsigned char ch); | 525 | static void put_char(struct tty_struct *tty, unsigned char ch); |
@@ -918,7 +918,7 @@ static void hangup(struct tty_struct *tty) | |||
918 | 918 | ||
919 | /* Set new termios settings | 919 | /* Set new termios settings |
920 | */ | 920 | */ |
921 | static void set_termios(struct tty_struct *tty, struct termios *old_termios) | 921 | static void set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
922 | { | 922 | { |
923 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 923 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; |
924 | unsigned long flags; | 924 | unsigned long flags; |
@@ -4034,6 +4034,8 @@ static int __init synclinkmp_init(void) | |||
4034 | serial_driver->init_termios = tty_std_termios; | 4034 | serial_driver->init_termios = tty_std_termios; |
4035 | serial_driver->init_termios.c_cflag = | 4035 | serial_driver->init_termios.c_cflag = |
4036 | B9600 | CS8 | CREAD | HUPCL | CLOCAL; | 4036 | B9600 | CS8 | CREAD | HUPCL | CLOCAL; |
4037 | serial_driver->init_termios.c_ispeed = 9600; | ||
4038 | serial_driver->init_termios.c_ospeed = 9600; | ||
4037 | serial_driver->flags = TTY_DRIVER_REAL_RAW; | 4039 | serial_driver->flags = TTY_DRIVER_REAL_RAW; |
4038 | tty_set_operations(serial_driver, &ops); | 4040 | tty_set_operations(serial_driver, &ops); |
4039 | if ((rc = tty_register_driver(serial_driver)) < 0) { | 4041 | if ((rc = tty_register_driver(serial_driver)) < 0) { |