diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2008-10-02 11:48:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:03 -0400 |
commit | 9beeee6584b9aa4f9192055512411484a2a624df (patch) | |
tree | 6eec55264d86791a1d4f61bdb9158cf9c720f7ce /drivers/usb/host/uhci-hcd.c | |
parent | 2b70f07343389cb474235def00b021a645ede916 (diff) |
USB: EHCI: log a warning if ehci-hcd is not loaded first
This patch (as1139) adds a warning to the system log whenever ehci-hcd
is loaded after ohci-hcd or uhci-hcd. Nowadays most distributions are
pretty good about not doing this; maybe the warning will help convince
anyone still doing it wrong.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org> [2.6.27]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 2dddb258b0db..cf5e4cf7ea42 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -955,6 +955,7 @@ static int __init uhci_hcd_init(void) | |||
955 | 955 | ||
956 | printk(KERN_INFO "uhci_hcd: " DRIVER_DESC "%s\n", | 956 | printk(KERN_INFO "uhci_hcd: " DRIVER_DESC "%s\n", |
957 | ignore_oc ? ", overcurrent ignored" : ""); | 957 | ignore_oc ? ", overcurrent ignored" : ""); |
958 | set_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
958 | 959 | ||
959 | if (DEBUG_CONFIGURED) { | 960 | if (DEBUG_CONFIGURED) { |
960 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); | 961 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); |
@@ -987,6 +988,7 @@ debug_failed: | |||
987 | 988 | ||
988 | errbuf_failed: | 989 | errbuf_failed: |
989 | 990 | ||
991 | clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
990 | return retval; | 992 | return retval; |
991 | } | 993 | } |
992 | 994 | ||
@@ -996,6 +998,7 @@ static void __exit uhci_hcd_cleanup(void) | |||
996 | kmem_cache_destroy(uhci_up_cachep); | 998 | kmem_cache_destroy(uhci_up_cachep); |
997 | debugfs_remove(uhci_debugfs_root); | 999 | debugfs_remove(uhci_debugfs_root); |
998 | kfree(errbuf); | 1000 | kfree(errbuf); |
1001 | clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded); | ||
999 | } | 1002 | } |
1000 | 1003 | ||
1001 | module_init(uhci_hcd_init); | 1004 | module_init(uhci_hcd_init); |