| From 1eaf35e4dd592c59041bc1ed3248c46326da1f5f Mon Sep 17 00:00:00 2001 |
| From: Oliver Neukum <oneukum@suse.com> |
| Date: Thu, 3 Dec 2015 15:03:34 +0100 |
| Subject: xhci: refuse loading if nousb is used |
| |
| From: Oliver Neukum <oneukum@suse.com> |
| |
| commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream. |
| |
| The module should fail to load. |
| |
| Signed-off-by: Oliver Neukum <oneukum@suse.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -5042,6 +5042,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; |
| } |
| |
