diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-09-01 11:39:22 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:32:40 -0700 |
| commit | b8580fde3ba44a0f00bf186dc5e4935bbd51be29 (patch) | |
| tree | f2a169c7114466933eac65fdaa4871add1ee6c92 | |
| parent | 11f4140f0e28e7ee9d1c3d824f8210759d2e8514 (diff) | |
| download | linux-stable-b8580fde3ba44a0f00bf186dc5e4935bbd51be29.tar.gz linux-stable-b8580fde3ba44a0f00bf186dc5e4935bbd51be29.tar.bz2 linux-stable-b8580fde3ba44a0f00bf186dc5e4935bbd51be29.zip | |
usb-serial: fix termios initialization logic
commit 7e29bb4b779f4f35385e6f21994758845bf14d23 upstream.
This patch (as1288) fixes the initialization logic in
serial_install(). A new tty always needs to have a termios
initialized no matter what, not just in the case where the lower
driver will override the termios settings.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index b92803299b84..a2a40cfba6bf 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -210,22 +210,21 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) if (!try_module_get(serial->type->driver.owner)) goto error_module_get; + /* perform the standard setup */ + retval = tty_init_termios(tty); + if (retval) + goto error_init_termios; + retval = usb_autopm_get_interface(serial->interface); if (retval) goto error_get_interface; - /* If the termios setup has yet to be done */ - if (tty->driver->termios[idx] == NULL) { - /* perform the standard setup */ - retval = tty_init_termios(tty); - if (retval) - goto error_init_termios; - /* allow the driver to update it */ - if (serial->type->init_termios) - serial->type->init_termios(tty); - } mutex_unlock(&serial->disc_mutex); + /* allow the driver to update the settings */ + if (serial->type->init_termios) + serial->type->init_termios(tty); + tty->driver_data = port; /* Final install (we use the default method) */ @@ -234,9 +233,8 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) driver->ttys[idx] = tty; return retval; - error_init_termios: - usb_autopm_put_interface(serial->interface); error_get_interface: + error_init_termios: module_put(serial->type->driver.owner); error_module_get: error_no_port: |