summaryrefslogtreecommitdiff
path: root/drivers/mux/mux-core.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-23 19:55:51 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-23 19:55:51 -0700
commit141769851cb73e8f986e9ed83129cde3b645288d (patch)
tree53bc1d8115e160df0ba1e315ca0ee7c858a01a53 /drivers/mux/mux-core.c
parent1bb90cf0462c9a07cb428e9dd9665041fe7f9e18 (diff)
parent520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff)
downloadlinux-141769851cb73e8f986e9ed83129cde3b645288d.tar.gz
linux-141769851cb73e8f986e9ed83129cde3b645288d.tar.xz
Merge 4.13-rc2 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mux/mux-core.c')
-rw-r--r--drivers/mux/mux-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mux/mux-core.c b/drivers/mux/mux-core.c
index 90b8995f07cb..2fe96c470112 100644
--- a/drivers/mux/mux-core.c
+++ b/drivers/mux/mux-core.c
@@ -46,7 +46,7 @@ static int __init mux_init(void)
static void __exit mux_exit(void)
{
- class_register(&mux_class);
+ class_unregister(&mux_class);
ida_destroy(&mux_ida);
}