Groups > linux.kernel > #1332050

[PATCH 3.12 20/64] xhci: refuse loading if nousb is used

From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[PATCH 3.12 20/64] xhci: refuse loading if nousb is used
Date	2016-02-11 15:30 +0100
Message-ID	<r10pR-1zg-37@gated-at.bofh.it> (permalink)
References	<r0ZWP-17m-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Oliver Neukum <oneukum@suse.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream.

The module should fail to load.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/usb/host/xhci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 47b25542a99c..6888e9a956d4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4891,6 +4891,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;
 unreg_pci:
 	xhci_unregister_pci();
-- 
2.7.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.12 20/64] xhci: refuse loading if nousb is used Jiri Slaby <jslaby@suse.cz> - 2016-02-11 15:30 +0100
  Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used Ben Hutchings <ben@decadent.org.uk> - 2016-02-16 04:10 +0100
    Re: [PATCH 3.12 20/64] xhci: refuse loading if nousb is used Jiri Slaby <jslaby@suse.cz> - 2016-02-16 09:50 +0100

csiph-web