From 42ee53d387bed881a0134710eaa67a4d86e123f5 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Wed, 26 Sep 2012 13:09:53 -0400 Subject: [PATCH] --- yaml --- r: 323201 b: refs/heads/master c: 0d00dc2611abbe6ad244d50569c2ee82ce42846c h: refs/heads/master i: 323199: 35d328081b2a0a5395624116caa898939b01967a v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/devices.c | 2 +- trunk/drivers/usb/core/hcd.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fffbe2bf1994..15e7d1567127 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01bb6501779ed0b6dc6c55be34b49eaa6306fdd8 +refs/heads/master: 0d00dc2611abbe6ad244d50569c2ee82ce42846c diff --git a/trunk/drivers/usb/core/devices.c b/trunk/drivers/usb/core/devices.c index d95696584762..3440812b4a84 100644 --- a/trunk/drivers/usb/core/devices.c +++ b/trunk/drivers/usb/core/devices.c @@ -624,7 +624,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, diff --git a/trunk/drivers/usb/core/hcd.c b/trunk/drivers/usb/core/hcd.c index bc84106ac057..75ba2091f9b4 100644 --- a/trunk/drivers/usb/core/hcd.c +++ b/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; }