diff options
| author | Gary King <GKing@nvidia.com> | 2010-02-01 18:28:05 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master-01.nvidia.com> | 2010-02-01 18:28:05 -0800 |
| commit | 940c406dd7aae4df77f28a048496f2e5ad1f5874 (patch) | |
| tree | e5d86887d4c71c314d543b1da4d4690967350343 /drivers | |
| parent | 417a18fb1e71a9975c77250f08ba45c4d7efbd6f (diff) | |
| parent | d9e56f630952e792a0617c16c3f564c7d57b712b (diff) | |
Merge "tegra pm: usb gadget suspend/resume support" into android-tegra-2.6.29
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/usb/gadget/fsl_udc_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index af03b80569a8..f9b7c4b114b9 100755 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -2657,6 +2657,7 @@ static int __exit fsl_udc_remove(struct platform_device *pdev) static int fsl_udc_suspend(struct platform_device *pdev, pm_message_t state) { dr_controller_stop(udc_controller); + platform_udc_clk_suspend(); return 0; } @@ -2666,6 +2667,7 @@ static int fsl_udc_suspend(struct platform_device *pdev, pm_message_t state) *-----------------------------------------------------------------*/ static int fsl_udc_resume(struct platform_device *pdev) { + platform_udc_clk_resume(); /* Enable DR irq reg and set controller Run */ if (udc_controller->stopped) { dr_controller_setup(udc_controller); |