Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / drivers / tty / bfin_jtag_comm.c

diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 02b7d3a09696cc6683c51fb9d02866d1ce75999b..1cfcdbf1d0ccd0a744cfa4a0c13f9fad9abf2f4f 100644 (file)
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -240,8 +240,6 @@ static int __init bfin_jc_init(void)
 {
        int ret;
 
-       tty_port_init(&port);
-
        bfin_jc_kthread = kthread_create(bfin_jc_emudat_manager, NULL, DRV_NAME);
        if (IS_ERR(bfin_jc_kthread))
                return PTR_ERR(bfin_jc_kthread);
@@ -257,6 +255,8 @@ static int __init bfin_jc_init(void)
        if (!bfin_jc_driver)
                goto err_driver;
 
+       tty_port_init(&port);
+
        bfin_jc_driver->driver_name  = DRV_NAME;
        bfin_jc_driver->name         = DEV_NAME;
        bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
@@ -274,6 +274,7 @@ static int __init bfin_jc_init(void)
        return 0;
 
  err:
+       tty_port_destroy(&port);
        put_tty_driver(bfin_jc_driver);
  err_driver:
        kfree(bfin_jc_write_buf.buf);
@@ -289,6 +290,7 @@ static void __exit bfin_jc_exit(void)
        kfree(bfin_jc_write_buf.buf);
        tty_unregister_driver(bfin_jc_driver);
        put_tty_driver(bfin_jc_driver);
+       tty_port_destroy(&port);
 }
 module_exit(bfin_jc_exit);