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>

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 9c5057c633271b05428923a89efc5545f4e4138d..fce4924dbbe88b6c49dbea3fe33221e224aece05 100644 (file)
--- 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;