diff options
Diffstat (limited to 'drivers/usb/host/ohci-at91.c')
-rw-r--r-- | drivers/usb/host/ohci-at91.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 85cc059705a6..b466581beb4a 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
@@ -193,7 +193,7 @@ ohci_at91_start (struct usb_hcd *hcd) | |||
193 | if ((ret = ohci_init(ohci)) < 0) | 193 | if ((ret = ohci_init(ohci)) < 0) |
194 | return ret; | 194 | return ret; |
195 | 195 | ||
196 | root->maxchild = board->ports; | 196 | ohci->num_ports = board->ports; |
197 | 197 | ||
198 | if ((ret = ohci_run(ohci)) < 0) { | 198 | if ((ret = ohci_run(ohci)) < 0) { |
199 | err("can't start %s", hcd->self.bus_name); | 199 | err("can't start %s", hcd->self.bus_name); |
@@ -221,6 +221,7 @@ static const struct hc_driver ohci_at91_hc_driver = { | |||
221 | */ | 221 | */ |
222 | .start = ohci_at91_start, | 222 | .start = ohci_at91_start, |
223 | .stop = ohci_stop, | 223 | .stop = ohci_stop, |
224 | .shutdown = ohci_shutdown, | ||
224 | 225 | ||
225 | /* | 226 | /* |
226 | * managing i/o requests and associated device resources | 227 | * managing i/o requests and associated device resources |
@@ -239,7 +240,7 @@ static const struct hc_driver ohci_at91_hc_driver = { | |||
239 | */ | 240 | */ |
240 | .hub_status_data = ohci_hub_status_data, | 241 | .hub_status_data = ohci_hub_status_data, |
241 | .hub_control = ohci_hub_control, | 242 | .hub_control = ohci_hub_control, |
242 | 243 | .hub_irq_enable = ohci_rhsc_enable, | |
243 | #ifdef CONFIG_PM | 244 | #ifdef CONFIG_PM |
244 | .bus_suspend = ohci_bus_suspend, | 245 | .bus_suspend = ohci_bus_suspend, |
245 | .bus_resume = ohci_bus_resume, | 246 | .bus_resume = ohci_bus_resume, |
@@ -296,6 +297,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev) | |||
296 | if (!clocked) { | 297 | if (!clocked) { |
297 | clk_enable(iclk); | 298 | clk_enable(iclk); |
298 | clk_enable(fclk); | 299 | clk_enable(fclk); |
300 | clocked = 1; | ||
299 | } | 301 | } |
300 | 302 | ||
301 | return 0; | 303 | return 0; |
@@ -310,6 +312,7 @@ MODULE_ALIAS("at91_ohci"); | |||
310 | static struct platform_driver ohci_hcd_at91_driver = { | 312 | static struct platform_driver ohci_hcd_at91_driver = { |
311 | .probe = ohci_hcd_at91_drv_probe, | 313 | .probe = ohci_hcd_at91_drv_probe, |
312 | .remove = ohci_hcd_at91_drv_remove, | 314 | .remove = ohci_hcd_at91_drv_remove, |
315 | .shutdown = usb_hcd_platform_shutdown, | ||
313 | .suspend = ohci_hcd_at91_drv_suspend, | 316 | .suspend = ohci_hcd_at91_drv_suspend, |
314 | .resume = ohci_hcd_at91_drv_resume, | 317 | .resume = ohci_hcd_at91_drv_resume, |
315 | .driver = { | 318 | .driver = { |