From: Oliver Neukum Date: Thu, 3 Dec 2015 14:03:34 +0000 (+0100) Subject: xhci: refuse loading if nousb is used X-Git-Tag: v3.16.35~660 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa25f0e64eec10217e6802b44c1824cd91b7b1c7;p=thirdparty%2Fkernel%2Fstable.git xhci: refuse loading if nousb is used commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream. The module should fail to load. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman [ luis: backported to 3.16: - moved usb_disabled() check to the top of the function so that there's no need to invoke xhci_unregister_pci() before returning. Suggested by gregkh. ] Signed-off-by: Luis Henriques --- diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 20209e870a993..d9dd9264f8135 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4928,6 +4928,9 @@ static int __init xhci_hcd_init(void) { int retval; + if (usb_disabled()) + return -ENODEV; + retval = xhci_register_pci(); if (retval < 0) { pr_debug("Problem registering PCI driver.\n"); @@ -4955,6 +4958,7 @@ static int __init xhci_hcd_init(void) BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8); /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */ BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8); + return 0; unreg_pci: xhci_unregister_pci();