| From b04c846ceaad42f9e37f3626c7e8f457603863f0 Mon Sep 17 00:00:00 2001 |
| From: Arthur Demchenkov <spinal.by@gmail.com> |
| Date: Tue, 19 May 2015 16:30:50 +0300 |
| Subject: usb: make module xhci_hcd removable |
| |
| From: Arthur Demchenkov <spinal.by@gmail.com> |
| |
| commit b04c846ceaad42f9e37f3626c7e8f457603863f0 upstream. |
| |
| 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). |
| |
| Signed-off-by: Arthur Demchenkov <spinal.by@gmail.com> |
| Reviewed-by: Andrew Bresticker <abrestic@chromium.org> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -5022,4 +5022,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); |
