summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:51:48 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 11:30:21 -0800
commitf8a8c10f4a662dcf3cb621d7a3eba564c5963284 (patch)
treee9f5b47549a2a6c838921eeee5ea6bbd484106a7
parent5289475d1375017ab4288b276383e9684280876d (diff)
downloadtalos-op-linux-f8a8c10f4a662dcf3cb621d7a3eba564c5963284.tar.gz
talos-op-linux-f8a8c10f4a662dcf3cb621d7a3eba564c5963284.zip
USB: cdc-acm, use tty_standard_install
This is a piece I missed the last time. Do not copy the functionality all over the tree. Instead, use the helper the tty layer provides us with. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Oliver Neukum <oneukum@suse.de> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 9543b19d410c..11a1130319d1 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -508,17 +508,12 @@ static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
if (!acm)
return -ENODEV;
- retval = tty_init_termios(tty);
+ retval = tty_standard_install(driver, tty);
if (retval)
goto error_init_termios;
tty->driver_data = acm;
- /* Final install (we use the default method) */
- tty_driver_kref_get(driver);
- tty->count++;
- driver->ttys[tty->index] = tty;
-
return 0;
error_init_termios:
OpenPOWER on IntegriCloud