Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1da47f54 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

USB: Use usb_disabled() consistently 



At few places we have used usb_disabled() and at other places used 'nousb'
directly. Lets be consistent and use usb_disabled();

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66e3e591

drivers/usb/core/usb.c

+2 −2
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ static void usb_debugfs_cleanup(void) 
static int __init usb_init(void)

{

	int retval;

	if (nousb) {

	if (usb_disabled()) {

		pr_info("%s: USB support disabled\n", usbcore_name);

		return 0;

	}
@@ -1102,7 +1102,7 @@ static int __init usb_init(void) 
static void __exit usb_exit(void)

{

	/* This will matter if shutdown/reboot does exitcalls. */

	if (nousb)

	if (usb_disabled())

		return;



	usb_deregister_device_driver(&usb_generic_driver);