TTY: call tty_port_destroy in the rest of drivers

After commit "TTY: move tty buffers to tty_port", the tty buffers are
not freed in some drivers. This is because tty_port_destructor is not
called whenever a tty_port is freed. This was an assumption I counted
with but was unfortunately untrue. So fix the drivers to fulfil this
assumption.

To be sure, the TTY buffers (and later some stuff) are gone along with
the tty_port, we have to call tty_port_destroy at tear-down places.
This is mostly where the structure containing a tty_port is freed.
This patch does exactly that -- put tty_port_destroy at those places.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 30a6b174fbb0..bc9d89a8c4f6 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -518,6 +518,7 @@ f_bcs:	gig_dbg(DEBUG_INIT, "freeing bcs[]");
         kfree(cs->bcs);
 f_cs:   gig_dbg(DEBUG_INIT, "freeing cs");
         mutex_unlock(&cs->mutex);
+        tty_port_destroy(&cs->port);
         free_cs(cs);
 }
 EXPORT_SYMBOL_GPL(gigaset_freecs);
@@ -751,14 +752,14 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         gig_dbg(DEBUG_INIT, "setting up iif");
         if (gigaset_isdn_regdev(cs, modulename) < 0) {
                 pr_err("error registering ISDN device\n");
-                goto error;
+                goto error_port;
         }
 
         make_valid(cs, VALID_ID);
         ++cs->cs_init;
         gig_dbg(DEBUG_INIT, "setting up hw");
         if (cs->ops->initcshw(cs) < 0)
-                goto error;
+                goto error_port;
 
         ++cs->cs_init;
 
@@ -773,7 +774,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
                 gig_dbg(DEBUG_INIT, "setting up bcs[%d]", i);
                 if (gigaset_initbcs(cs->bcs + i, cs, i) < 0) {
                         pr_err("could not allocate channel %d data\n", i);
-                        goto error;
+                        goto error_port;
                 }
         }
 
@@ -786,7 +787,8 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
 
         gig_dbg(DEBUG_INIT, "cs initialized");
         return cs;
-
+error_port:
+        tty_port_destroy(&cs->port);
 error:
         gig_dbg(DEBUG_INIT, "failed");
         gigaset_freecs(cs);
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index b817809f763c..e09dc8a5e743 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1849,6 +1849,8 @@ err_unregister:
                 kfree(info->fax);
 #endif
                 kfree(info->port.xmit_buf - 4);
+                info->port.xmit_buf = NULL;
+                tty_port_destroy(&info->port);
         }
         tty_unregister_driver(m->tty_modem);
 err:
@@ -1870,6 +1872,8 @@ isdn_tty_exit(void)
                 kfree(info->fax);
 #endif
                 kfree(info->port.xmit_buf - 4);
+                info->port.xmit_buf = NULL;
+                tty_port_destroy(&info->port);
         }
         tty_unregister_driver(dev->mdm.tty_modem);
         put_tty_driver(dev->mdm.tty_modem);