aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-08-16 16:17:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:55:16 -0400
commite39ab592f182cd0be48acc4ad49f93ef4100017c (patch)
tree5decd15d20fac5a8fbc33d7eeed66b6cb9d9725c /drivers/usb/host
parentf311cf58bd04adc683067f8d66daa5925b80f082 (diff)
USB: remove unnecessary tests in isp116x and sl811
This patch (as962) cleans up some code I forgot to remove earlier in the isp116x and sl811 HCDs. There is no longer any need to check for unlink-during-submit; it can't happen since the endpoint queues are now under the protection of the HCD-private spinlock. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: David Brownell <david-b@pacbell.net> CC: Olav Kongas <ok@artecdesign.ee> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/isp116x-hcd.c6
-rw-r--r--drivers/usb/host/sl811-hcd.c10
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index d5027dc75a57..f2b5d6281c5d 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -815,12 +815,6 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
815 } 815 }
816 } 816 }
817 817
818 /* in case of unlink-during-submit */
819 if (urb->status != -EINPROGRESS) {
820 finish_request(isp116x, ep, urb);
821 ret = 0;
822 goto fail;
823 }
824 urb->hcpriv = hep; 818 urb->hcpriv = hep;
825 start_atl_transfers(isp116x); 819 start_atl_transfers(isp116x);
826 820
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 3d3a63d002c5..15a93f946afd 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -957,17 +957,7 @@ static int sl811h_urb_enqueue(
957 sofirq_on(sl811); 957 sofirq_on(sl811);
958 } 958 }
959 959
960 /* in case of unlink-during-submit */
961 spin_lock(&urb->lock);
962 if (urb->status != -EINPROGRESS) {
963 spin_unlock(&urb->lock);
964 finish_request(sl811, ep, urb, 0);
965 retval = 0;
966 goto fail;
967 }
968 urb->hcpriv = hep; 960 urb->hcpriv = hep;
969 spin_unlock(&urb->lock);
970
971 start_transfer(sl811); 961 start_transfer(sl811);
972 sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable); 962 sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable);
973fail: 963fail: