aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/omap_udc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
-rw-r--r--drivers/usb/gadget/omap_udc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index b66ea5a6ed79..98cbcbc16cc1 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2809,17 +2809,15 @@ static int __exit omap_udc_remove(struct device *dev)
2809 return 0; 2809 return 0;
2810} 2810}
2811 2811
2812/* suspend/resume/wakeup from sysfs (echo > power/state) */ 2812static int omap_udc_suspend(struct device *dev, pm_message_t state, u32 level)
2813
2814static int omap_udc_suspend(struct device *dev, u32 state, u32 level)
2815{ 2813{
2816 if (level != 0) 2814 if (level != 0)
2817 return 0; 2815 return 0;
2818 2816
2819 DBG("suspend, state %d\n", state); 2817 DBG("suspend, state %d\n", state);
2820 omap_pullup(&udc->gadget, 0); 2818 omap_pullup(&udc->gadget, 0);
2821 udc->gadget.dev.power.power_state = 3; 2819 udc->gadget.dev.power.power_state = PMSG_SUSPEND;
2822 udc->gadget.dev.parent->power.power_state = 3; 2820 udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND;
2823 return 0; 2821 return 0;
2824} 2822}
2825 2823
@@ -2829,8 +2827,8 @@ static int omap_udc_resume(struct device *dev, u32 level)
2829 return 0; 2827 return 0;
2830 2828
2831 DBG("resume + wakeup/SRP\n"); 2829 DBG("resume + wakeup/SRP\n");
2832 udc->gadget.dev.parent->power.power_state = 0; 2830 udc->gadget.dev.parent->power.power_state = PMSG_ON;
2833 udc->gadget.dev.power.power_state = 0; 2831 udc->gadget.dev.power.power_state = PMSG_ON;
2834 omap_pullup(&udc->gadget, 1); 2832 omap_pullup(&udc->gadget, 1);
2835 2833
2836 /* maybe the host would enumerate us if we nudged it */ 2834 /* maybe the host would enumerate us if we nudged it */