| From | Ben Hutchings <> | Date | Mon, 08 Feb 2016 23:53:51 +0000 | Subject | [PATCH 3.2 10/87] xhci: refuse loading if nousb is used |
| |
3.2.77-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <oneukum@suse.com>
commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream.
The module should fail to load.
Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: xhci_hcd_init() registers the PCI driver, so check before doing that rather than at the end of the function] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/usb/host/xhci.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4300,6 +4300,9 @@ static int __init xhci_hcd_init(void) { int retval; + if (usb_disabled()) + return -ENODEV; + retval = xhci_register_pci(); if (retval < 0) { printk(KERN_DEBUG "Problem registering PCI driver.");
|