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/misc | |
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/misc')
-rw-r--r-- | drivers/misc/pti.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c index 4999b34b7a60..a1f0d174e687 100644 --- a/drivers/misc/pti.c +++ b/drivers/misc/pti.c | |||
@@ -882,11 +882,14 @@ err: | |||
882 | static void __devexit pti_pci_remove(struct pci_dev *pdev) | 882 | static void __devexit pti_pci_remove(struct pci_dev *pdev) |
883 | { | 883 | { |
884 | struct pti_dev *drv_data = pci_get_drvdata(pdev); | 884 | struct pti_dev *drv_data = pci_get_drvdata(pdev); |
885 | unsigned int a; | ||
885 | 886 | ||
886 | unregister_console(&pti_console); | 887 | unregister_console(&pti_console); |
887 | 888 | ||
888 | tty_unregister_device(pti_tty_driver, 0); | 889 | for (a = 0; a < PTITTY_MINOR_NUM; a++) { |
889 | tty_unregister_device(pti_tty_driver, 1); | 890 | tty_unregister_device(pti_tty_driver, a); |
891 | tty_port_destroy(&drv_data->port[a]); | ||
892 | } | ||
890 | 893 | ||
891 | iounmap(drv_data->pti_ioaddr); | 894 | iounmap(drv_data->pti_ioaddr); |
892 | pci_set_drvdata(pdev, NULL); | 895 | pci_set_drvdata(pdev, NULL); |