---

yaml
---
r: 326143
b: refs/heads/master
c: 0a23140
h: refs/heads/master
i:
  326141: e36a688
  326139: d7cb696
  326135: d8f34a7
  326127: 5c93901
  326111: 26e5d29
  326079: f8af581
  326015: 8b421aa
  325887: dbd92cc
  325631: 5c660b6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 655db7980596f0ad4f15f8f4c51beb3e705762de
+refs/heads/master: 0a2314035cab62cafc38ea11ec5b6f95cf347b38

trunk/drivers/usb/core/devices.c

@@ -623,7 +623,7 @@ static ssize_t usb_device_read(struct file *file, char __user *buf,
 	/* print devices for all busses */
 	list_for_each_entry(bus, &usb_bus_list, bus_list) {
 		/* recurse through all children of the root hub */
-		if (!bus->root_hub)
+		if (!bus_to_hcd(bus)->rh_registered)
 			continue;
 		usb_lock_device(bus->root_hub);
 		ret = usb_device_dump(&buf, &nbytes, &skip_bytes, ppos,

trunk/drivers/usb/core/hcd.c

@@ -1011,10 +1011,7 @@ static int register_root_hub(struct usb_hcd *hcd)
 	if (retval) {
 		dev_err (parent_dev, "can't register root hub for %s, %d\n",
 				dev_name(&usb_dev->dev), retval);
-	}
-	mutex_unlock(&usb_bus_list_lock);
-
-	if (retval == 0) {
+	} else {
 		spin_lock_irq (&hcd_root_hub_lock);
 		hcd->rh_registered = 1;
 		spin_unlock_irq (&hcd_root_hub_lock);
@@ -1023,6 +1020,7 @@ static int register_root_hub(struct usb_hcd *hcd)
 		if (HCD_DEAD(hcd))
 			usb_hc_died (hcd);	/* This time clean up */
 	}
+	mutex_unlock(&usb_bus_list_lock);
 
 	return retval;
 }