diff options
| author | Alan Cox <alan@redhat.com> | 2008-07-22 11:09:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 13:03:22 -0700 |
| commit | 72e2741256e65f2adcc03754523d6a2fdb260e4a (patch) | |
| tree | 8d4ee7fcf003c33cd4920565a9bace26eacaaa43 /drivers/usb/serial/whiteheat.c | |
| parent | 80359a9c5c03d585686e2596c9ee46703eb03047 (diff) | |
whiteheat: fix bugs found in the tidy and audit
Termios tidy up, plus fix break and DTR.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/serial/whiteheat.c')
| -rw-r--r-- | drivers/usb/serial/whiteheat.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 2569b68b8334..05374b99a2f8 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c @@ -671,11 +671,8 @@ static int whiteheat_open(struct tty_struct *tty, goto exit; } - if (tty) { - old_term.c_cflag = ~tty->termios->c_cflag; - old_term.c_iflag = ~tty->termios->c_iflag; - whiteheat_set_termios(tty, port, &old_term); - } + if (tty) + firm_setup_port(tty); /* Work around HCD bugs */ usb_clear_halt(port->serial->dev, port->read_urb->pipe); @@ -926,7 +923,6 @@ static int whiteheat_ioctl(struct tty_struct *tty, struct file *file, static void whiteheat_set_termios(struct tty_struct *tty, struct usb_serial_port *port, struct ktermios *old_termios) { - /* FIXME */ firm_setup_port(tty); } @@ -1322,7 +1318,7 @@ static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff) dtr_command.port = port->number - port->serial->minor + 1; dtr_command.state = onoff; - return firm_send_command(port, WHITEHEAT_SET_RTS, + return firm_send_command(port, WHITEHEAT_SET_DTR, (__u8 *)&dtr_command, sizeof(dtr_command)); } @@ -1333,7 +1329,7 @@ static int firm_set_break(struct usb_serial_port *port, __u8 onoff) break_command.port = port->number - port->serial->minor + 1; break_command.state = onoff; - return firm_send_command(port, WHITEHEAT_SET_RTS, + return firm_send_command(port, WHITEHEAT_SET_BREAK, (__u8 *)&break_command, sizeof(break_command)); } |