aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/console.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/console.c')
-rw-r--r--drivers/usb/serial/console.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 3806e7014199..a66b01bb1fa1 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -147,10 +147,7 @@ static int usb_console_setup(struct console *co, char *options)
147 kref_get(&tty->driver->kref); 147 kref_get(&tty->driver->kref);
148 __module_get(tty->driver->owner); 148 __module_get(tty->driver->owner);
149 tty->ops = &usb_console_fake_tty_ops; 149 tty->ops = &usb_console_fake_tty_ops;
150 if (tty_init_termios(tty)) { 150 tty_init_termios(tty);
151 retval = -ENOMEM;
152 goto put_tty;
153 }
154 tty_port_tty_set(&port->port, tty); 151 tty_port_tty_set(&port->port, tty);
155 } 152 }
156 153
@@ -185,7 +182,6 @@ static int usb_console_setup(struct console *co, char *options)
185 182
186 fail: 183 fail:
187 tty_port_tty_set(&port->port, NULL); 184 tty_port_tty_set(&port->port, NULL);
188 put_tty:
189 tty_kref_put(tty); 185 tty_kref_put(tty);
190 reset_open_count: 186 reset_open_count:
191 port->port.count = 0; 187 port->port.count = 0;