Explorar el Código

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>
David Lopo hace 17 años
padre
commit
7a6ad1dd86
Se han modificado 1 ficheros con 4 adiciones y 3 borrados
  1. 4 3
      drivers/usb/gadget/zero.c

+ 4 - 3
drivers/usb/gadget/zero.c

@@ -1134,6 +1134,10 @@ autoconf_fail:
 	dev->gadget = gadget;
 	dev->gadget = gadget;
 	set_gadget_data(gadget, dev);
 	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 */
 	/* preallocate control response and buffer */
 	dev->req = usb_ep_alloc_request(gadget->ep0, GFP_KERNEL);
 	dev->req = usb_ep_alloc_request(gadget->ep0, GFP_KERNEL);
 	if (!dev->req)
 	if (!dev->req)
@@ -1165,9 +1169,6 @@ autoconf_fail:
 
 
 	usb_gadget_set_selfpowered(gadget);
 	usb_gadget_set_selfpowered(gadget);
 
 
-	init_timer(&dev->resume);
-	dev->resume.function = zero_autoresume;
-	dev->resume.data = (unsigned long) dev;
 	if (autoresume) {
 	if (autoresume) {
 		source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
 		source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
 		loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
 		loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;