aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lopo <lopo.david@gmail.com>2008-04-18 18:49:01 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-02 10:25:54 -0700
commit7a6ad1dd86a45da8f235300349d4abd9ae7d1a21 (patch)
tree28f651aadce98f8037c0682d0a30cf39e0bde13a
parent7472f38b10c884f47241529d1367f77c2e1b3551 (diff)
usb: gadget zero timer init fix
Initialize timer earlier so if an error occurs allocating USB request or buffer request (zero_bind) Gadget Zero will not hang trying to delete an uninitialized timer (zero_unbind). Signed-off-by: David Lopo <lopo.david@gmail.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/zero.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 9c5057c6332..fce4924dbbe 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1134,6 +1134,10 @@ autoconf_fail:
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 @@ autoconf_fail:
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;