aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serdev
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-02 08:23:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-02 08:23:43 +0200
commit16ecf49c10a1e8ecf917f91b93dd85624349e930 (patch)
treef05d0a17219ae9173c45deee57b06e807632c6d0 /drivers/tty/serdev
parentvt: unicode fallback for scrollback (diff)
parentLinux 4.18-rc3 (diff)
downloadlinux-dev-16ecf49c10a1e8ecf917f91b93dd85624349e930.tar.xz
linux-dev-16ecf49c10a1e8ecf917f91b93dd85624349e930.zip
Merge 4.18-rc3 into tty-next
We want ths tty core changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serdev')
-rw-r--r--drivers/tty/serdev/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index e5e84303faca..bd47c46ec993 100644
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -644,6 +644,7 @@ EXPORT_SYMBOL_GPL(__serdev_device_driver_register);
static void __exit serdev_exit(void)
{
bus_unregister(&serdev_bus_type);
+ ida_destroy(&ctrl_ida);
}
module_exit(serdev_exit);