From: Oliver Neukum <oneukum@suse.com>
Date: Thu, 3 Dec 2015 14:03:34 +0000 (+0100)
Subject: xhci: refuse loading if nousb is used
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1eaf35e4dd592c59041bc1ed3248c46326da1f5f;p=deliverable%2Flinux.git

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>
---

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;
 }