Merge branch 'master' into for-next

[cascardo/linux.git] / drivers / tty / ipwireless / tty.c

diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 160f0ad..2cde13d 100644 (file)
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -566,6 +566,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
                        ipwireless_disassociate_network_ttys(network,
                                                             ttyj->channel_idx);
                        tty_unregister_device(ipw_tty_driver, j);
+                       tty_port_destroy(&ttyj->port);
                        ttys[j] = NULL;
                        mutex_unlock(&ttyj->ipw_tty_mutex);
                        kfree(ttyj);