Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82206
b: refs/heads/master
c: c87d6a4
h: refs/heads/master
v: v3
  • Loading branch information
Aristeu Rozanski authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent 3916c4c commit 8c10fd1
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9a6b1efa6fd1ee022fdf42c91a9868c589cc95b7
refs/heads/master: c87d6a4f67657f4f1b992eea43796c7e7c09fb17
82 changes: 48 additions & 34 deletions trunk/drivers/usb/serial/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ static int usb_console_setup(struct console *co, char *options)
struct usb_serial *serial;
struct usb_serial_port *port;
int retval = 0;
struct tty_struct *tty;
struct ktermios *termios;
struct tty_struct *tty = NULL;
struct ktermios *termios = NULL, dummy;

dbg ("%s", __FUNCTION__);

Expand Down Expand Up @@ -151,50 +151,64 @@ static int usb_console_setup(struct console *co, char *options)

++port->open_count;
if (port->open_count == 1) {
if (serial->type->set_termios) {
/*
* allocate a fake tty so the driver can initialize
* the termios structure, then later call set_termios to
* configure according to command line arguments
*/
tty = kzalloc(sizeof(*tty), GFP_KERNEL);
if (!tty) {
retval = -ENOMEM;
err("no more memory");
goto reset_open_count;
}
termios = kzalloc(sizeof(*termios), GFP_KERNEL);
if (!termios) {
retval = -ENOMEM;
err("no more memory");
goto free_tty;
}
memset(&dummy, 0, sizeof(struct ktermios));
tty->termios = termios;
port->tty = tty;
}

/* only call the device specific open if this
* is the first time the port is opened */
if (serial->type->open)
retval = serial->type->open(port, NULL);
else
retval = usb_serial_generic_open(port, NULL);
if (retval)
port->open_count = 0;
}

if (retval) {
err ("could not open USB console port");
return retval;
}

if (serial->type->set_termios) {
struct ktermios dummy;
/* build up a fake tty structure so that the open call has something
* to look at to get the cflag value */
tty = kzalloc(sizeof(*tty), GFP_KERNEL);
if (!tty) {
err ("no more memory");
return -ENOMEM;
if (retval) {
err("could not open USB console port");
goto free_termios;
}
termios = kzalloc(sizeof(*termios), GFP_KERNEL);
if (!termios) {
err ("no more memory");
kfree (tty);
return -ENOMEM;
}
memset(&dummy, 0, sizeof(struct ktermios));
termios->c_cflag = cflag;
tty->termios = termios;
port->tty = tty;

/* set up the initial termios settings */
serial->type->set_termios(port, &dummy);
port->tty = NULL;
kfree (termios);
kfree (tty);
if (serial->type->set_termios) {
termios->c_cflag = cflag;
serial->type->set_termios(port, &dummy);

port->tty = NULL;
kfree(termios);
kfree(tty);
}
}

port->console = 1;
retval = 0;

return 0;
out:
return retval;
free_termios:
kfree(termios);
port->tty = NULL;
free_tty:
kfree(tty);
reset_open_count:
port->open_count = 0;
goto out;
}

static void usb_console_write(struct console *co, const char *buf, unsigned count)
Expand Down

0 comments on commit 8c10fd1

Please sign in to comment.