diff options
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 3a7bfe7a8874..cf5e4cf7ea42 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -53,7 +53,6 @@ | |||
53 | /* | 53 | /* |
54 | * Version Information | 54 | * Version Information |
55 | */ | 55 | */ |
56 | #define DRIVER_VERSION "v3.0" | ||
57 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ | 56 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ |
58 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ | 57 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ |
59 | Alan Stern" | 58 | Alan Stern" |
@@ -951,12 +950,13 @@ static int __init uhci_hcd_init(void) | |||
951 | { | 950 | { |
952 | int retval = -ENOMEM; | 951 | int retval = -ENOMEM; |
953 | 952 | ||
954 | printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "%s\n", | ||
955 | ignore_oc ? ", overcurrent ignored" : ""); | ||
956 | |||
957 | if (usb_disabled()) | 953 | if (usb_disabled()) |
958 | return -ENODEV; | 954 | return -ENODEV; |
959 | 955 | ||
956 | printk(KERN_INFO "uhci_hcd: " DRIVER_DESC "%s\n", | ||
957 | ignore_oc ? ", overcurrent ignored" : ""); | ||
958 | set_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
959 | |||
960 | if (DEBUG_CONFIGURED) { | 960 | if (DEBUG_CONFIGURED) { |
961 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); | 961 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); |
962 | if (!errbuf) | 962 | if (!errbuf) |
@@ -988,6 +988,7 @@ debug_failed: | |||
988 | 988 | ||
989 | errbuf_failed: | 989 | errbuf_failed: |
990 | 990 | ||
991 | clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
991 | return retval; | 992 | return retval; |
992 | } | 993 | } |
993 | 994 | ||
@@ -997,6 +998,7 @@ static void __exit uhci_hcd_cleanup(void) | |||
997 | kmem_cache_destroy(uhci_up_cachep); | 998 | kmem_cache_destroy(uhci_up_cachep); |
998 | debugfs_remove(uhci_debugfs_root); | 999 | debugfs_remove(uhci_debugfs_root); |
999 | kfree(errbuf); | 1000 | kfree(errbuf); |
1001 | clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
1000 | } | 1002 | } |
1001 | 1003 | ||
1002 | module_init(uhci_hcd_init); | 1004 | module_init(uhci_hcd_init); |