UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] USB: replace __setup("nousb") with __module_param_call 

Fedora users complain that passing "nousbstorage" to the installer causes
the rest of the USB support to disappear. The installer uses kernel command
line as a way to pass options through Syslinux. The problem stems from the
use of strncmp() in obsolete_checksetup().

I used __module_param_call() instead of module_param because I wanted to
preserve the old syntax in grub.conf, and it's the only macro which allows
to remove the prefix.

The fix is tested to accept the option "nousb" correctly now.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pete Zaitcev 2005-12-20 14:15:04 -08:00 committed by Greg Kroah-Hartman
parent 5e0f76c6bb
commit aafbf24a11
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/core/usb.c
View File

@ -46,7 +46,6 @@
const char *usbcore_name = "usbcore"; const char *usbcore_name = "usbcore";
static int nousb; /* Disable USB when built into kernel image */ static int nousb; /* Disable USB when built into kernel image */
/* Not honored on modular build */
/** /**
@ -1096,18 +1095,8 @@ struct bus_type usb_bus_type = {
.resume = usb_generic_resume, .resume = usb_generic_resume,
}; };
#ifndef MODULE
static int __init usb_setup_disable(char *str)
{
nousb = 1;
return 1;
}
/* format to disable USB on kernel command line is: nousb */ /* format to disable USB on kernel command line is: nousb */
__setup("nousb", usb_setup_disable); __module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444);
#endif
/* /*
* for external read access to <nousb> * for external read access to <nousb>