diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/usb/core/hcd.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/core/hcd.c')
| -rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index ff19d64041b5..14c47a10da86 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -782,7 +782,8 @@ static int usb_register_bus(struct usb_bus *bus) | |||
| 782 | return -E2BIG; | 782 | return -E2BIG; |
| 783 | } | 783 | } |
| 784 | 784 | ||
| 785 | bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb_host%d", busnum); | 785 | bus->class_dev = class_device_create(usb_host_class, NULL, MKDEV(0,0), |
| 786 | bus->controller, "usb_host%d", busnum); | ||
| 786 | if (IS_ERR(bus->class_dev)) { | 787 | if (IS_ERR(bus->class_dev)) { |
| 787 | clear_bit(busnum, busmap.busmap); | 788 | clear_bit(busnum, busmap.busmap); |
| 788 | up(&usb_bus_list_lock); | 789 | up(&usb_bus_list_lock); |