This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / misc / auerswald.c

diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 94842c3..c4bebda 100644 (file)
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -516,7 +516,7 @@ static void auerchain_unlink_all (pauerchain_t acp)
                 urbp = acep->urbp;
                 urbp->transfer_flags &= ~URB_ASYNC_UNLINK;
                 dbg ("unlink active urb");
-                usb_kill_urb (urbp);
+                usb_unlink_urb (urbp);
         }
 }
 
@@ -1171,16 +1171,22 @@ intoend:
    endpoint. This function returns 0 if successful or an error code.
    NOTE: no mutex please!
 */
-static void auerswald_int_release (pauerswald_t cp)
+static int auerswald_int_release (pauerswald_t cp)
 {
+        int ret = 0;
         dbg ("auerswald_int_release");
 
         /* stop the int endpoint */
-        if (cp->inturbp)
-                usb_kill_urb (cp->inturbp);
+        if (cp->inturbp) {
+                ret = usb_unlink_urb (cp->inturbp);
+                if (ret)
+                       dbg ("nonzero int unlink result received: %d", ret);
+        }
 
         /* deallocate memory */
         auerswald_int_free (cp);
+
+        return ret;
 }
 
 /* --------------------------------------------------------------------- */