git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
xhci: refuse loading if nousb is used
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
xhci.c
diff --git
a/drivers/usb/host/xhci.c
b/drivers/usb/host/xhci.c
index
d7ddb5a
..
a1f90c7
100644
(file)
--- 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.");