diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-08 17:16:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-24 21:16:55 -0700 |
| commit | a5b6f60c5a30c494017c7a2d11c4067f90d3d0df (patch) | |
| tree | 2f80d1a6c2655c5c12f40cafbc47516284934d42 /drivers/usb/serial/generic.c | |
| parent | 441b62c1edb986827154768d89bbac0ba779984f (diff) | |
| download | blackbird-op-linux-a5b6f60c5a30c494017c7a2d11c4067f90d3d0df.tar.gz blackbird-op-linux-a5b6f60c5a30c494017c7a2d11c4067f90d3d0df.zip | |
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/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 2078667db4aa..65765ce76251 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -262,13 +262,14 @@ int usb_serial_generic_write_room (struct usb_serial_port *port) dbg("%s - port %d", __func__, port->number); + /* FIXME: Locking */ if (serial->num_bulk_out) { if (!(port->write_urb_busy)) room = port->bulk_out_size; } dbg("%s - returns %d", __func__, room); - return (room); + return room; } int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port) @@ -278,6 +279,7 @@ int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port) dbg("%s - port %d", __func__, port->number); + /* FIXME: Locking */ if (serial->num_bulk_out) { if (port->write_urb_busy) chars = port->write_urb->transfer_buffer_length; @@ -368,7 +370,6 @@ void usb_serial_generic_write_bulk_callback (struct urb *urb) __func__, status); return; } - usb_serial_port_softint(port); } EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback); |
