Merge branch 'master' into for-next

[linux-2.6.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 34a928d3b7d2f69ddf671330cc9bbb60dbf5405c..ac0f7a4b03410f51dd8b637717207222cea4f259 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1080,7 +1080,6 @@ nogood:
        ep->hcpriv = NULL;
 done:
        spin_unlock_irqrestore (&ehci->lock, flags);
-       return;
 }
 
 static void