Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / usb / host / ehci-mxc.c

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index c8e360d7d9759dbde4eff329781c252d5d27e806..25c8c10bb6891d1c020a711e2ae6396401680c2e 100644 (file)
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -203,11 +203,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
                mdelay(10);
        }
 
-       /* setup specific usb hw */
-       ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
-       if (ret < 0)
-               goto err_init;
-
        ehci = hcd_to_ehci(hcd);
 
        /* EHCI registers start at offset 0x100 */