Cleanup newly allocated device nodes in case of configuration failure.

common/usb.c

 /*
  *
  * Most of this source has been derived from the Linux USB
  * project:
  * (C) Copyright Linus Torvalds 1999
  * (C) Copyright Johannes Erdfelt 1999-2001
  * (C) Copyright Andreas Gal 1999
  * (C) Copyright Gregory P. Smith 1999
  * (C) Copyright Deti Fliegl 1999 (new USB architecture)
  * (C) Copyright Randy Dunlap 2000
@@ skipping 736 matching lines @@
         /* default Address is 0, real addresses start with 1 */
         usb_dev[dev_index].devnum = dev_index + 1;
         usb_dev[dev_index].maxchild = 0;
         for (i = 0; i < USB_MAXCHILDREN; i++)
                 usb_dev[dev_index].children[i] = NULL;
         usb_dev[dev_index].parent = NULL;
         dev_index++;
         return &usb_dev[dev_index - 1];
 }
 
+/*
+ * Free the newly created device node.
+ * Called in error cases where configuring a newly attached
+ * device fails for some reason.
+ */
+void usb_free_device(void)
+{
+        dev_index--;
+        USB_PRINTF("Freeing device node: %d \n", dev_index);
+        memset(&usb_dev[dev_index], 0, sizeof(struct usb_device));
+        usb_dev[dev_index].devnum = -1;
+}
 
 /*
  * By the time we get here, the device has gotten a new device ID
  * and is in the default state. We need to identify the thing and
  * get the ball rolling..
  *
  * Returns 0 for success, != 0 for error.
  */
 int usb_new_device(struct usb_device *dev)
 {
@@ skipping 386 matching lines @@
         else if (portstatus & USB_PORT_STAT_LOW_SPEED)
                 usb->speed = USB_SPEED_LOW;
         else
                 usb->speed = USB_SPEED_FULL;
 
         dev->children[port] = usb;
         usb->parent = dev;
         /* Run it through the hoops (find a driver, etc) */
         if (usb_new_device(usb)) {
                 /* Woops, disable the port */
+                usb_free_device();
+                dev->children[port] = NULL;
                 USB_HUB_PRINTF("hub: disabling port %d\n", port + 1);
                 usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
         }
 }
 
 
 int usb_hub_configure(struct usb_device *dev)
 {
         unsigned char buffer[USB_BUFSIZ], *bitmap;
         struct usb_hub_descriptor *descriptor;
@@ skipping 197 matching lines @@
         /* If it's not an interrupt endpoint, we'd better punt! */
         if ((ep->bmAttributes & 3) != 3)
                 return 0;
         /* We found a hub */
         USB_HUB_PRINTF("USB hub found\n");
         ret = usb_hub_configure(dev);
         return ret;
 }
 
 /* EOF */