diff options
Diffstat (limited to 'drivers/usb/host/ehci-w90x900.c')
-rw-r--r-- | drivers/usb/host/ehci-w90x900.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c index 3d2e26cbb34c..ec598082c14b 100644 --- a/drivers/usb/host/ehci-w90x900.c +++ b/drivers/usb/host/ehci-w90x900.c | |||
@@ -71,21 +71,14 @@ static int __devinit usb_w90x900_probe(const struct hc_driver *driver, | |||
71 | val |= ENPHY; | 71 | val |= ENPHY; |
72 | __raw_writel(val, ehci->regs+PHY1_CTR); | 72 | __raw_writel(val, ehci->regs+PHY1_CTR); |
73 | 73 | ||
74 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
75 | ehci->sbrn = 0x20; | ||
76 | |||
77 | irq = platform_get_irq(pdev, 0); | 74 | irq = platform_get_irq(pdev, 0); |
78 | if (irq < 0) | 75 | if (irq < 0) |
79 | goto err4; | 76 | goto err4; |
80 | 77 | ||
81 | ehci_reset(ehci); | ||
82 | |||
83 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); | 78 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
84 | if (retval != 0) | 79 | if (retval != 0) |
85 | goto err4; | 80 | goto err4; |
86 | 81 | ||
87 | ehci_writel(ehci, 1, &ehci->regs->configured_flag); | ||
88 | |||
89 | return retval; | 82 | return retval; |
90 | err4: | 83 | err4: |
91 | iounmap(hcd->regs); | 84 | iounmap(hcd->regs); |
@@ -120,7 +113,7 @@ static const struct hc_driver ehci_w90x900_hc_driver = { | |||
120 | /* | 113 | /* |
121 | * basic lifecycle operations | 114 | * basic lifecycle operations |
122 | */ | 115 | */ |
123 | .reset = ehci_init, | 116 | .reset = ehci_setup, |
124 | .start = ehci_run, | 117 | .start = ehci_run, |
125 | 118 | ||
126 | .stop = ehci_stop, | 119 | .stop = ehci_stop, |