diff options
| author | Jeff Garzik | 2005-10-29 03:32:01 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-10-29 03:32:01 +0200 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/usb/gadget/omap_udc.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.gz kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.xz kernel-qcow2-linux-5615ca7906aefbdc3318604c89db5931d0a25910.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 287c5900fb13..b7885dc0f42f 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -2909,12 +2909,10 @@ static int __exit omap_udc_remove(struct device *dev) * may involve talking to an external transceiver (e.g. isp1301). */ -static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) +static int omap_udc_suspend(struct device *dev, pm_message_t message) { u32 devstat; - if (level != SUSPEND_POWER_DOWN) - return 0; devstat = UDC_DEVSTAT_REG; /* we're requesting 48 MHz clock if the pullup is enabled @@ -2931,11 +2929,8 @@ static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) return 0; } -static int omap_udc_resume(struct device *dev, u32 level) +static int omap_udc_resume(struct device *dev) { - if (level != RESUME_POWER_ON) - return 0; - DBG("resume + wakeup/SRP\n"); omap_pullup(&udc->gadget, 1); |