From de65b4e03ffaccdb759d344d68d47309ec850f50 Mon Sep 17 00:00:00 2001 From: "Aric D. Blumer" Date: Thu, 30 Jul 2009 13:42:30 -0400 Subject: [PATCH] --- yaml --- r: 166111 b: refs/heads/master c: a75d048e1409bb2bae0d71645c4f6247d2ce9276 h: refs/heads/master i: 166109: 237913c55892ad62dd9deca26f473580fda07772 166107: 2966aae654a4251051fa1758edc95e2c81cb0c99 166103: f7a8262f8079b9789c7baf6eb30a58a85de8638d 166095: c4076e5cf547d55fc5e14611720ced1ff6576252 166079: aec2c2d144e38d5206fa2d885986cd651cf6ac83 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-pxa27x.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 286f4504f6a7..743aeb7d84c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85c6102100150522f8fbc80cffdd08d1f8b66c87 +refs/heads/master: a75d048e1409bb2bae0d71645c4f6247d2ce9276 diff --git a/trunk/drivers/usb/host/ohci-pxa27x.c b/trunk/drivers/usb/host/ohci-pxa27x.c index 61800742fc07..bbc0c3b720b2 100644 --- a/trunk/drivers/usb/host/ohci-pxa27x.c +++ b/trunk/drivers/usb/host/ohci-pxa27x.c @@ -497,6 +497,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd); + struct pxaohci_platform_data *inf = dev->platform_data; int status; if (time_before(jiffies, ohci->ohci.next_statechange)) @@ -506,6 +507,9 @@ static int ohci_hcd_pxa27x_drv_resume(struct device *dev) if ((status = pxa27x_start_hc(ohci, dev)) < 0) return status; + /* Select Power Management Mode */ + pxa27x_ohci_select_pmm(ohci, inf->port_mode); + ohci_finish_controller_resume(hcd); return 0; }