diff options
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
-rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 8ad9b3b604b5..70b0d4b459e7 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -298,7 +298,6 @@ static const struct hc_driver ohci_pxa27x_hc_driver = { | |||
298 | */ | 298 | */ |
299 | .hub_status_data = ohci_hub_status_data, | 299 | .hub_status_data = ohci_hub_status_data, |
300 | .hub_control = ohci_hub_control, | 300 | .hub_control = ohci_hub_control, |
301 | .hub_irq_enable = ohci_rhsc_enable, | ||
302 | #ifdef CONFIG_PM | 301 | #ifdef CONFIG_PM |
303 | .bus_suspend = ohci_bus_suspend, | 302 | .bus_suspend = ohci_bus_suspend, |
304 | .bus_resume = ohci_bus_resume, | 303 | .bus_resume = ohci_bus_resume, |
@@ -339,7 +338,6 @@ static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_ | |||
339 | 338 | ||
340 | pxa27x_stop_hc(&pdev->dev); | 339 | pxa27x_stop_hc(&pdev->dev); |
341 | hcd->state = HC_STATE_SUSPENDED; | 340 | hcd->state = HC_STATE_SUSPENDED; |
342 | pdev->dev.power.power_state = PMSG_SUSPEND; | ||
343 | 341 | ||
344 | return 0; | 342 | return 0; |
345 | } | 343 | } |
@@ -357,9 +355,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev) | |||
357 | if ((status = pxa27x_start_hc(&pdev->dev)) < 0) | 355 | if ((status = pxa27x_start_hc(&pdev->dev)) < 0) |
358 | return status; | 356 | return status; |
359 | 357 | ||
360 | pdev->dev.power.power_state = PMSG_ON; | 358 | ohci_finish_controller_resume(hcd); |
361 | usb_hcd_resume_root_hub(hcd); | ||
362 | |||
363 | return 0; | 359 | return 0; |
364 | } | 360 | } |
365 | #endif | 361 | #endif |