lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] USB: fix up remaining pm_message_t usages

Browse Source 
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pavel Machek
2005-04-18 17:39:24 -07:00
committed by Greg K-H
parent 9a5d3e98dd
commit ba9d35fb01
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/gadget/omap_udc.c
View File

@ -2809,17 +2809,15 @@ static int __exit omap_udc_remove(struct device *dev)
return 0;
}
/* suspend/resume/wakeup from sysfs (echo > power/state) */
static int omap_udc_suspend(struct device *dev, u32 state, u32 level)
static int omap_udc_suspend(struct device *dev, pm_message_t state, u32 level)
{
if (level != 0)
return 0;
DBG("suspend, state %d\n", state);
omap_pullup(&udc->gadget, 0);
udc->gadget.dev.power.power_state = 3;
udc->gadget.dev.parent->power.power_state = 3;
udc->gadget.dev.power.power_state = PMSG_SUSPEND;
udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND;
return 0;
}
@ -2829,8 +2827,8 @@ static int omap_udc_resume(struct device *dev, u32 level)
return 0;
DBG("resume + wakeup/SRP\n");
udc->gadget.dev.parent->power.power_state = 0;
udc->gadget.dev.power.power_state = 0;
udc->gadget.dev.parent->power.power_state = PMSG_ON;
udc->gadget.dev.power.power_state = PMSG_ON;
omap_pullup(&udc->gadget, 1);
/* maybe the host would enumerate us if we nudged it */