Commit b04c846c authored May 19, 2015 by Arthur Demchenkov Committed by Greg Kroah-Hartman May 24, 2015

usb: make module xhci_hcd removable



Fixed regression. After commit 29e409f0 ("xhci: Allow xHCI drivers to
be built as separate modules") the module xhci_hcd became non-removable.
That behaviour is not expected and there're no notes about it in commit
message. The module should be removable as it blocks PM suspend/resume
functions (Debian Bug#666406).

Signed-off-by: Arthur Demchenkov <spinal.by@gmail.com>
Reviewed-by: Andrew Bresticker <abrestic@chromium.org>
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e2608180

drivers/usb/host/xhci.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5011,4 +5011,12 @@ static int __init xhci_hcd_init(void)
	BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8128)32/8);		BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8128)32/8);
	return 0;		return 0;
	}		}

			/*
			* If an init function is provided, an exit function must also be provided
			* to allow module unload.
			*/
			static void __exit xhci_hcd_fini(void) { }

	module_init(xhci_hcd_init);		module_init(xhci_hcd_init);
			module_exit(xhci_hcd_fini);