diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:32:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:32:12 -0400 |
| commit | f65e77693aa5a1cf688fc378bc6913a56f9ff7b7 (patch) | |
| tree | 5d5b6ee3e3f9da241a583bf49ab648637ac4c1a9 /drivers/usb | |
| parent | 8566cfc9fe0934f52ddedc12b083176116c13978 (diff) | |
| parent | d856f1e337782326c638c70c0b4df2b909350dec (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 79422a3b07bc..9f44e83c6a69 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -782,7 +782,7 @@ 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%d", busnum); | 785 | bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb_host%d", busnum); |
| 786 | if (IS_ERR(bus->class_dev)) { | 786 | if (IS_ERR(bus->class_dev)) { |
| 787 | clear_bit(busnum, busmap.busmap); | 787 | clear_bit(busnum, busmap.busmap); |
| 788 | up(&usb_bus_list_lock); | 788 | up(&usb_bus_list_lock); |