projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
097a9ea
)
xhci: refuse loading if nousb is used
author
Oliver Neukum
<oneukum@suse.com>
Thu, 3 Dec 2015 14:03:34 +0000
(15:03 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 4 Dec 2015 16:29:54 +0000
(08:29 -0800)
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>
drivers/usb/host/xhci.c
patch
|
blob
|
history
diff --git
a/drivers/usb/host/xhci.c
b/drivers/usb/host/xhci.c
index
887f308
..
643d312
100644
(file)
--- 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;
}