Merge tag 'regmap-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

[mirror_ubuntu-artful-kernel.git] / drivers / usb / host / ehci-mxc.c

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 4a08fc0b27c9e541da76b9598120b646ab7aa9a5..8804f74689d7f06ced124d59d7b2833634b4fc2e 100644 (file)
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -39,17 +39,9 @@ struct ehci_mxc_priv {
 /* called during probe() after chip reset completes */
 static int ehci_mxc_setup(struct usb_hcd *hcd)
 {
-       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-       int retval;
-
        hcd->has_tt = 1;
 
-       retval = ehci_setup(hcd);
-       if (retval)
-               return retval;
-
-       ehci_port_power(ehci, 0);
-       return 0;
+       return ehci_setup(hcd);
 }
 
 static const struct hc_driver ehci_mxc_hc_driver = {