--- drivers/usb-greg/hcd.c	Sun Jan 20 18:00:22 2002
+++ drivers/usb/hcd.c	Sun Jan 20 18:40:44 2002
@@ -1175,6 +1175,8 @@
 			dbg ("%s: wait for giveback urb %p",
 				hcd->bus_name, urb);
 		}
+	} else if ((urb->transfer_flags & USB_ASYNC_UNLINK) && retval == 0) {
+		return -EINPROGRESS;
 	}
 	goto bye;
 done:
--- drivers/usb-greg/hcd/ehci-hcd.c	Sun Jan 20 18:00:22 2002
+++ drivers/usb/hcd/ehci-hcd.c	Sun Jan 20 18:09:04 2002
@@ -86,7 +86,7 @@
 // #define EHCI_VERBOSE_DEBUG
 // #define have_iso
 
-#ifdef	DEBUG
+#ifdef	CONFIG_DEBUG_SLAB
 #	define	EHCI_SLAB_FLAGS		(SLAB_POISON)
 #else
 #	define	EHCI_SLAB_FLAGS		0