diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-08 12:16:06 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | a5b6f60c5a30c494017c7a2d11c4067f90d3d0df (patch) | |
tree | 2f80d1a6c2655c5c12f40cafbc47516284934d42 /drivers/usb/serial/omninet.c | |
parent | 441b62c1edb986827154768d89bbac0ba779984f (diff) |
usb serial: more fixes and groundwork for tty changes
- If a termios change fails due to lack of memory we should copy the
old settings back over as the device has not changed
- Note various locking problems
- kl5kusb105 had various remaining tty flag handling problems
- Make safe_serial use tty_insert_flip_string not open coded loops
- set termios speed properly in usb_serial
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-rw-r--r-- | drivers/usb/serial/omninet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 1b041c59aab2..10090cb52d31 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
@@ -295,8 +295,9 @@ static int omninet_write_room (struct usb_serial_port *port) | |||
295 | struct usb_serial *serial = port->serial; | 295 | struct usb_serial *serial = port->serial; |
296 | struct usb_serial_port *wport = serial->port[1]; | 296 | struct usb_serial_port *wport = serial->port[1]; |
297 | 297 | ||
298 | int room = 0; // Default: no room | 298 | int room = 0; /* Default: no room */ |
299 | 299 | ||
300 | /* FIXME: no consistent locking for write_urb_busy */ | ||
300 | if (wport->write_urb_busy) | 301 | if (wport->write_urb_busy) |
301 | room = wport->bulk_out_size - OMNINET_HEADERLEN; | 302 | room = wport->bulk_out_size - OMNINET_HEADERLEN; |
302 | 303 | ||