Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index 6081e1ed3ac9..0c90a24fa989 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -21,17 +21,10 @@ struct ehci_sh_priv {
 static int ehci_sh_reset(struct usb_hcd *hcd)
 {
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        int ret;
 
         ehci->caps = hcd->regs;
 
-        ret = ehci_setup(hcd);
-        if (unlikely(ret))
-                return ret;
-
-        ehci_port_power(ehci, 0);
-
-        return ret;
+        return ehci_setup(hcd);
 }
 
 static const struct hc_driver ehci_sh_hc_driver = {