Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[karo-tx-linux.git] / drivers / usb / serial / sierra.c

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ed30adefff857d093c84ef41e77d868983f383a4..29074c1ba22b6dd504218328e11c177ae4a76ab6 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -457,7 +457,7 @@ static void sierra_indat_callback(struct urb *urb)
        dbg("%s: %p", __func__, urb);
 
        endpoint = usb_pipeendpoint(urb->pipe);
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
 
        if (status) {
                dbg("%s: nonzero status: %d on endpoint %02x.",
@@ -487,7 +487,7 @@ static void sierra_instat_callback(struct urb *urb)
 {
        int err;
        int status = urb->status;
-       struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
+       struct usb_serial_port *port =  urb->context;
        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
        struct usb_serial *serial = port->serial;
 
@@ -566,6 +566,8 @@ static int sierra_chars_in_buffer(struct usb_serial_port *port)
         * have sent out, but hasn't made it through to the
         * device as we can't see the backend here, so just
         * tell the tty layer that everything is flushed.
+        *
+        * FIXME: should walk the outstanding urbs info
         */
        return 0;
 }