diff options
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 27483f91a4a3..aa4b0d775992 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
| @@ -207,7 +207,7 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) | |||
| 207 | if (retval) | 207 | if (retval) |
| 208 | goto error_get_interface; | 208 | goto error_get_interface; |
| 209 | 209 | ||
| 210 | retval = tty_standard_install(driver, tty); | 210 | retval = tty_port_install(&port->port, driver, tty); |
| 211 | if (retval) | 211 | if (retval) |
| 212 | goto error_init_termios; | 212 | goto error_init_termios; |
| 213 | 213 | ||
| @@ -305,8 +305,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp) | |||
| 305 | * Do the resource freeing and refcount dropping for the port. | 305 | * Do the resource freeing and refcount dropping for the port. |
| 306 | * Avoid freeing the console. | 306 | * Avoid freeing the console. |
| 307 | * | 307 | * |
| 308 | * Called asynchronously after the last tty kref is dropped, | 308 | * Called asynchronously after the last tty kref is dropped. |
| 309 | * and the tty layer has already done the tty_shutdown(tty); | ||
| 310 | */ | 309 | */ |
| 311 | static void serial_cleanup(struct tty_struct *tty) | 310 | static void serial_cleanup(struct tty_struct *tty) |
| 312 | { | 311 | { |
| @@ -423,7 +422,7 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old) | |||
| 423 | if (port->serial->type->set_termios) | 422 | if (port->serial->type->set_termios) |
| 424 | port->serial->type->set_termios(tty, port, old); | 423 | port->serial->type->set_termios(tty, port, old); |
| 425 | else | 424 | else |
| 426 | tty_termios_copy_hw(tty->termios, old); | 425 | tty_termios_copy_hw(&tty->termios, old); |
| 427 | } | 426 | } |
| 428 | 427 | ||
| 429 | static int serial_break(struct tty_struct *tty, int break_state) | 428 | static int serial_break(struct tty_struct *tty, int break_state) |
