usb serial: more fixes and groundwork for tty changes

[linux-2.6-block.git] / drivers / usb / serial / generic.c

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 2078667db4aaad9ac1e0312e3be50bc3133e1337..65765ce76251171e5d10697c79188bd190bb77d1 100644 (file)
--- 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);