Skip to content

Commit

Permalink
[PATCH] USB: Correct ohci-pxa27x suspend/resume struct confusion
Browse files Browse the repository at this point in the history
The device data in ohci-pxa27x is a struct hcd, not a struct ohci_hcd.
This correct the suspend/resume calls to account for this and adds some
code to invalidate the platform data when the module is removed.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Richard Purdie authored and Greg Kroah-Hartman committed Jan 4, 2006
1 parent 4c4c943 commit a5e36d2
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/usb/host/ohci-pxa27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,28 +309,31 @@ 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;
}

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))
Expand All @@ -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;
}
Expand Down

0 comments on commit a5e36d2

Please sign in to comment.