diff options
| author | Oliver Neukum <oneukum@suse.com> | 2015-12-03 15:03:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-04 08:29:54 -0800 |
| commit | 1eaf35e4dd592c59041bc1ed3248c46326da1f5f (patch) | |
| tree | 98669817e60cdda803581671f5f281bd0bfba512 | |
| parent | 097a9ea0e48fa33159ad47d1dc9ef3b215bfc090 (diff) | |
| download | linux-1eaf35e4dd592c59041bc1ed3248c46326da1f5f.tar.bz2 | |
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>
| -rw-r--r-- | drivers/usb/host/xhci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 887f308376f6..643d3121d100 100644 --- a/drivers/usb/host/xhci.c +++ b/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; } |