---

yaml
---
r: 289271
b: refs/heads/master
c: 76f82a7
h: refs/heads/master
i:
  289269: db1d36c
  289267: d084525
  289263: 1f4c0da
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d450e84ec656ec4b774c41cd8d46b3e48d51df
+refs/heads/master: 76f82a7ab3a724791d184e74529e96ad6947a98f

trunk/drivers/usb/serial/usb-serial.c

@@ -214,15 +214,14 @@ 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;
 
+	retval = tty_standard_install(driver, tty);
+	if (retval)
+		goto error_init_termios;
+
 	mutex_unlock(&serial->disc_mutex);
 
 	/* allow the driver to update the settings */
@@ -231,14 +230,11 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
 
 	tty->driver_data = port;
 
-	/* Final install (we use the default method) */
-	tty_driver_kref_get(driver);
-	tty->count++;
-	driver->ttys[idx] = tty;
 	return retval;
 
- error_get_interface:
  error_init_termios:
+	usb_autopm_put_interface(serial->interface);
+ error_get_interface:
 	module_put(serial->type->driver.owner);
  error_module_get:
  error_no_port: