Merge branch 'linus' into x86/amd-iommu

[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..5adaf36e47d05627dd1d9a884895ceaa28608aef 100644 (file)
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -177,7 +177,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 +192,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