Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci-ep93xx.c

diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 156e93a9d0df3f3ee2ee96c7fc29241e9885a05c..06aadfb0ec29a4683830a1d47191174e3f99b500 100644 (file)
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -135,7 +135,6 @@ static struct hc_driver ohci_ep93xx_hc_driver = {
        .get_frame_number       = ohci_get_frame,
        .hub_status_data        = ohci_hub_status_data,
        .hub_control            = ohci_hub_control,
-       .hub_irq_enable         = ohci_rhsc_enable,
 #ifdef CONFIG_PM
        .bus_suspend            = ohci_bus_suspend,
        .bus_resume             = ohci_bus_resume,
@@ -177,7 +176,6 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_
 
        ep93xx_stop_hc(&pdev->dev);
        hcd->state = HC_STATE_SUSPENDED;
-       pdev->dev.power.power_state = PMSG_SUSPEND;
 
        return 0;
 }
@@ -193,9 +191,8 @@ static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)
        ohci->next_statechange = jiffies;
 
        ep93xx_start_hc(&pdev->dev);
-       pdev->dev.power.power_state = PMSG_ON;
-       usb_hcd_resume_root_hub(hcd);
 
+       ohci_finish_controller_resume(hcd);
        return 0;
 }
 #endif