From 377feb9cd9cb308aec2b89c66d6da504c4c8d754 Mon Sep 17 00:00:00 2001 From: David Lopo Date: Fri, 18 Apr 2008 18:49:01 -0700 Subject: [PATCH] --- yaml --- r: 95792 b: refs/heads/master c: 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/zero.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b615d3c242dc..3cf8820e39e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7472f38b10c884f47241529d1367f77c2e1b3551 +refs/heads/master: 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21 diff --git a/trunk/drivers/usb/gadget/zero.c b/trunk/drivers/usb/gadget/zero.c index 9c5057c63327..fce4924dbbe8 100644 --- a/trunk/drivers/usb/gadget/zero.c +++ b/trunk/drivers/usb/gadget/zero.c @@ -1134,6 +1134,10 @@ static int __init zero_bind(struct usb_gadget *gadget) dev->gadget = gadget; set_gadget_data(gadget, dev); + init_timer(&dev->resume); + dev->resume.function = zero_autoresume; + dev->resume.data = (unsigned long) dev; + /* preallocate control response and buffer */ dev->req = usb_ep_alloc_request(gadget->ep0, GFP_KERNEL); if (!dev->req) @@ -1165,9 +1169,6 @@ static int __init zero_bind(struct usb_gadget *gadget) usb_gadget_set_selfpowered(gadget); - init_timer(&dev->resume); - dev->resume.function = zero_autoresume; - dev->resume.data = (unsigned long) dev; if (autoresume) { source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP; loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;