Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/usb/hso.c

+8 −4
Original line number Diff line number Diff line
@@ -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);

}