Hi,

sending a separate patch for ftdi_sio.c.

Description:

corrected handling when unlinking read URB's, that were synchronous
- usb_kill_urb() is used from now on.

Thanks for applying,

Jan

Jan Capek - CCS Inc.
Firmware developer

Signed-off-by: Jan Capek <[EMAIL PROTECTED]>
-------------------------------------------------------------------
--- linux-2.6.9-rc1-mm1/drivers/usb/serial/ftdi_sio.c   2004-09-08 04:51:23.000000000 
+0200
+++ linux-2.6.9-rc1-mm1-ccs/drivers/usb/serial/ftdi_sio.c       2004-09-08 
14:00:53.000000000 +0200
@@ -1487,17 +1487,9 @@
                }
        } /* Note change no line if hupcl is off */
        
-       /* shutdown our bulk read */
-       if (port->read_urb) {
-               if (usb_unlink_urb (port->read_urb) < 0) {
-                       /* Generally, this isn't an error.  If the previous
-                          read bulk callback occurred (or is about to occur)
-                          while the port was being closed or was throtted
-                          (and is still throttled), the read urb will not
-                          have been submitted. */
-                       dbg("%s - failed to unlink read urb (generally not an error)", 
__FUNCTION__);
-               }
-       }
+       /* shutdown our bulk read - synchronously */
+       usb_kill_urb(port->read_urb);
+
 } /* ftdi_close */
 
 

Reply via email to