Commit d230788f authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: hso, free tty_driver

Do not leak tty_driver structure on each module removal. Also do
proper frees in fail paths of module_init.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Jan Dumon <j.dumon@option.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 005ce07f
...@@ -3332,7 +3332,7 @@ static int __init hso_init(void) ...@@ -3332,7 +3332,7 @@ static int __init hso_init(void)
if (result) { if (result) {
printk(KERN_ERR "%s - tty_register_driver failed(%d)\n", printk(KERN_ERR "%s - tty_register_driver failed(%d)\n",
__func__, result); __func__, result);
return result; goto err_free_tty;
} }
/* register this module as an usb driver */ /* register this module as an usb driver */
...@@ -3340,13 +3340,16 @@ static int __init hso_init(void) ...@@ -3340,13 +3340,16 @@ static int __init hso_init(void)
if (result) { if (result) {
printk(KERN_ERR "Could not register hso driver? error: %d\n", printk(KERN_ERR "Could not register hso driver? error: %d\n",
result); result);
/* cleanup serial interface */ goto err_unreg_tty;
tty_unregister_driver(tty_drv);
return result;
} }
/* done */ /* done */
return 0; return 0;
err_unreg_tty:
tty_unregister_driver(tty_drv);
err_free_tty:
put_tty_driver(tty_drv);
return result;
} }
static void __exit hso_exit(void) static void __exit hso_exit(void)
...@@ -3354,6 +3357,7 @@ static void __exit hso_exit(void) ...@@ -3354,6 +3357,7 @@ static void __exit hso_exit(void)
printk(KERN_INFO "hso: unloaded\n"); printk(KERN_INFO "hso: unloaded\n");
tty_unregister_driver(tty_drv); tty_unregister_driver(tty_drv);
put_tty_driver(tty_drv);
/* deregister the usb driver */ /* deregister the usb driver */
usb_deregister(&hso_driver); usb_deregister(&hso_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment