Ver código fonte

xhci: refuse loading if nousb is used

The module should fail to load.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
CC: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oliver Neukum 9 anos atrás
pai
commit
1eaf35e4dd
1 arquivos alterados com 4 adições e 0 exclusões
  1. 4 0
      drivers/usb/host/xhci.c

+ 4 - 0
drivers/usb/host/xhci.c

@@ -5068,6 +5068,10 @@ 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);
+
+	if (usb_disabled())
+		return -ENODEV;
+
 	return 0;
 }