From 0b32db665946573ac14c7706439f06cb8132fb84 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 28 Nov 2005 22:15:46 +0000 Subject: [PATCH] --- yaml --- r: 15481 b: refs/heads/master c: a5e36d20897ff8317e722fceb4d9eea3e4a5906b h: refs/heads/master i: 15479: 9054595ba41608e80c00cd56c8e744e8f2886a1f v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-pxa27x.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e3d9ea47794c..672aa3e27f80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c4c9432a6c916729c7296c47fe93b053a73e20c +refs/heads/master: a5e36d20897ff8317e722fceb4d9eea3e4a5906b diff --git a/trunk/drivers/usb/host/ohci-pxa27x.c b/trunk/drivers/usb/host/ohci-pxa27x.c index 3b1cfe939483..acde8868da21 100644 --- a/trunk/drivers/usb/host/ohci-pxa27x.c +++ b/trunk/drivers/usb/host/ohci-pxa27x.c @@ -309,20 +309,22 @@ static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev) struct usb_hcd *hcd = platform_get_drvdata(pdev); usb_hcd_pxa27x_remove(hcd, pdev); + platform_set_drvdata(pdev, NULL); return 0; } #ifdef CONFIG_PM static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_t state) { - struct ohci_hcd *ohci = platform_get_drvdata(pdev); + struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct ohci_hcd *ohci = hcd_to_ohci(hcd); if (time_before(jiffies, ohci->next_statechange)) msleep(5); ohci->next_statechange = jiffies; pxa27x_stop_hc(&pdev->dev); - ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED; + hcd->state = HC_STATE_SUSPENDED; pdev->dev.power.power_state = PMSG_SUSPEND; return 0; @@ -330,7 +332,8 @@ static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev) { - struct ohci_hcd *ohci = platform_get_drvdata(pdev); + struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct ohci_hcd *ohci = hcd_to_ohci(hcd); int status; if (time_before(jiffies, ohci->next_statechange)) @@ -341,7 +344,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev) return status; pdev->dev.power.power_state = PMSG_ON; - usb_hcd_resume_root_hub(platform_get_drvdata(pdev)); + usb_hcd_resume_root_hub(hcd); return 0; }