aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index b1fb9aef0f5b..006951728520 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1045,7 +1045,7 @@ static void usb_debugfs_cleanup(void)
1045static int __init usb_init(void) 1045static int __init usb_init(void)
1046{ 1046{
1047 int retval; 1047 int retval;
1048 if (nousb) { 1048 if (usb_disabled()) {
1049 pr_info("%s: USB support disabled\n", usbcore_name); 1049 pr_info("%s: USB support disabled\n", usbcore_name);
1050 return 0; 1050 return 0;
1051 } 1051 }
@@ -1102,7 +1102,7 @@ out:
1102static void __exit usb_exit(void) 1102static void __exit usb_exit(void)
1103{ 1103{
1104 /* This will matter if shutdown/reboot does exitcalls. */ 1104 /* This will matter if shutdown/reboot does exitcalls. */
1105 if (nousb) 1105 if (usb_disabled())
1106 return; 1106 return;
1107 1107
1108 usb_deregister_device_driver(&usb_generic_driver); 1108 usb_deregister_device_driver(&usb_generic_driver);