Patch "xhci: refuse loading if nousb is used" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

xhci: refuse loading if nousb is used

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xhci-refuse-loading-if-nousb-is-used.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Oliver Neukum <[email protected]>
Date: Thu, 3 Dec 2015 15:03:34 +0100
Subject: xhci: refuse loading if nousb is used

From: Oliver Neukum <[email protected]>

commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream.

The module should fail to load.

---
 drivers/usb/host/xhci.c |    4 ++++
 1 file changed, 4 insertions(+)

@@ -5059,6 +5059,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;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/xhci-refuse-loading-if-nousb-is-used.patch