]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
TTY: hso, free tty_driver
authorJiri Slaby <jslaby@suse.cz>
Mon, 2 Apr 2012 11:54:04 +0000 (13:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Apr 2012 18:18:36 +0000 (11:18 -0700)
Do not leak tty_driver structure on each module removal. Also do
proper frees in fail paths of module_init.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jan Dumon <j.dumon@option.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/usb/hso.c

index abe47ad59479ecb2a2c5708cd6ec23d60d68731e..cdc589edeaf691547637ddac2225532c15c4f836 100644 (file)
@@ -3332,7 +3332,7 @@ static int __init hso_init(void)
        if (result) {
                printk(KERN_ERR "%s - tty_register_driver failed(%d)\n",
                        __func__, result);
-               return result;
+               goto err_free_tty;
        }
 
        /* register this module as an usb driver */
@@ -3340,13 +3340,16 @@ static int __init hso_init(void)
        if (result) {
                printk(KERN_ERR "Could not register hso driver? error: %d\n",
                        result);
-               /* cleanup serial interface */
-               tty_unregister_driver(tty_drv);
-               return result;
+               goto err_unreg_tty;
        }
 
        /* done */
        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)
@@ -3354,6 +3357,7 @@ static void __exit hso_exit(void)
        printk(KERN_INFO "hso: unloaded\n");
 
        tty_unregister_driver(tty_drv);
+       put_tty_driver(tty_drv);
        /* deregister the usb driver */
        usb_deregister(&hso_driver);
 }