From df56ea9d723c672b6ba0471b131280738938374c Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Thu, 16 Aug 2007 16:17:49 -0400
Subject: [PATCH] --- yaml --- r: 67853 b: refs/heads/master c:
 e39ab592f182cd0be48acc4ad49f93ef4100017c h: refs/heads/master i:   67851:
 3fefc2a4b0a190f0deefa3eb87f8272cd9fb798a v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/host/isp116x-hcd.c |  6 ------
 trunk/drivers/usb/host/sl811-hcd.c   | 10 ----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a399913a8531..e5b90c66d2e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f311cf58bd04adc683067f8d66daa5925b80f082
+refs/heads/master: e39ab592f182cd0be48acc4ad49f93ef4100017c
diff --git a/trunk/drivers/usb/host/isp116x-hcd.c b/trunk/drivers/usb/host/isp116x-hcd.c
index d5027dc75a57..f2b5d6281c5d 100644
--- a/trunk/drivers/usb/host/isp116x-hcd.c
+++ b/trunk/drivers/usb/host/isp116x-hcd.c
@@ -815,12 +815,6 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
 		}
 	}
 
-	/* in case of unlink-during-submit */
-	if (urb->status != -EINPROGRESS) {
-		finish_request(isp116x, ep, urb);
-		ret = 0;
-		goto fail;
-	}
 	urb->hcpriv = hep;
 	start_atl_transfers(isp116x);
 
diff --git a/trunk/drivers/usb/host/sl811-hcd.c b/trunk/drivers/usb/host/sl811-hcd.c
index 3d3a63d002c5..15a93f946afd 100644
--- a/trunk/drivers/usb/host/sl811-hcd.c
+++ b/trunk/drivers/usb/host/sl811-hcd.c
@@ -957,17 +957,7 @@ static int sl811h_urb_enqueue(
 		sofirq_on(sl811);
 	}
 
-	/* in case of unlink-during-submit */
-	spin_lock(&urb->lock);
-	if (urb->status != -EINPROGRESS) {
-		spin_unlock(&urb->lock);
-		finish_request(sl811, ep, urb, 0);
-		retval = 0;
-		goto fail;
-	}
 	urb->hcpriv = hep;
-	spin_unlock(&urb->lock);
-
 	start_transfer(sl811);
 	sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable);
 fail: