[PATCH] USB: fix address assignment after device reset

Until my ambitious project gets going, this patch at least fixes the
problem of assigning a device's new address following a device reset.
The only change needed to David's original suggestion was to handle the
pathway involved in registering root hubs.

drivers/usb/core/hcd.c

@@ -720,6 +720,7 @@ int usb_register_root_hub (struct usb_device *usb_dev, struct device *parent_dev
 	int retval;
 
 	sprintf (&usb_dev->dev.bus_id[0], "usb%d", usb_dev->bus->busnum);
+	usb_dev->state = USB_STATE_DEFAULT;
 	retval = usb_new_device (usb_dev, parent_dev);
 	if (retval)
 		dev_err (parent_dev, "can't register root hub for %s, %d\n",

drivers/usb/core/hub.c

@@ -737,6 +737,9 @@ static int usb_hub_port_reset(struct usb_device *hub, int port,
 		if (status != -1) {
 			usb_clear_port_feature(hub,
 				port + 1, USB_PORT_FEAT_C_RESET);
+			dev->state = status
+					? USB_STATE_NOTATTACHED
+					: USB_STATE_DEFAULT;
 			return status;
 		}
 

drivers/usb/core/usb.c

@@ -1017,9 +1017,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
 	/* dma masks come from the controller; readonly, except to hcd */
 	dev->dev.dma_mask = parent->dma_mask;
 
-	/* it's not usable yet */
-	dev->state = USB_STATE_DEFAULT;
-
 	/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ...
 	 * it's fixed size except for full speed devices.
 	 */