patch "usb: make module xhci_hcd removable" added to usb-linus

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

usb: make module xhci_hcd removable

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From: Arthur Demchenkov <[email protected]>
Date: Tue, 19 May 2015 16:30:50 +0300
Subject: usb: make module xhci_hcd removable

Fixed regression. After commit 29e409f0f761 ("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).

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

index ec8ac1674854..4299cbf47793 100644
@@ -5011,4 +5011,12 @@ static int __init xhci_hcd_init(void)
 	BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
 	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_exit(xhci_hcd_fini);

2.4.1