diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-11-15 03:49:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 20:20:58 -0500 |
commit | 191c5f10275cfbb36802edadbdb10c73537327b4 (patch) | |
tree | 93e6f0d57cb1295fb7c461dbe5ecefafeb4ad15a /drivers/tty/synclink_gt.c | |
parent | d0f59141ca40159c9d142c0f62e9aea61f846539 (diff) |
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>
Diffstat (limited to 'drivers/tty/synclink_gt.c')
-rw-r--r-- | drivers/tty/synclink_gt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index b38e954eedd3..6e4c34011b7e 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c | |||
@@ -3645,8 +3645,10 @@ static void device_init(int adapter_num, struct pci_dev *pdev) | |||
3645 | for (i=0; i < port_count; ++i) { | 3645 | for (i=0; i < port_count; ++i) { |
3646 | port_array[i] = alloc_dev(adapter_num, i, pdev); | 3646 | port_array[i] = alloc_dev(adapter_num, i, pdev); |
3647 | if (port_array[i] == NULL) { | 3647 | if (port_array[i] == NULL) { |
3648 | for (--i; i >= 0; --i) | 3648 | for (--i; i >= 0; --i) { |
3649 | tty_port_destroy(&port_array[i]->port); | ||
3649 | kfree(port_array[i]); | 3650 | kfree(port_array[i]); |
3651 | } | ||
3650 | return; | 3652 | return; |
3651 | } | 3653 | } |
3652 | } | 3654 | } |
@@ -3773,6 +3775,7 @@ static void slgt_cleanup(void) | |||
3773 | release_resources(info); | 3775 | release_resources(info); |
3774 | tmp = info; | 3776 | tmp = info; |
3775 | info = info->next_device; | 3777 | info = info->next_device; |
3778 | tty_port_destroy(&tmp->port); | ||
3776 | kfree(tmp); | 3779 | kfree(tmp); |
3777 | } | 3780 | } |
3778 | 3781 | ||