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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
d0f59141ca
commit
191c5f1027
@@ -3934,7 +3934,7 @@ err:
|
||||
static void __devexit cy_pci_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct cyclades_card *cinfo = pci_get_drvdata(pdev);
|
||||
unsigned int i;
|
||||
unsigned int i, channel;
|
||||
|
||||
/* non-Z with old PLX */
|
||||
if (!cy_is_Z(cinfo) && (readb(cinfo->base_addr + CyPLX_VER) & 0x0f) ==
|
||||
@@ -3960,9 +3960,11 @@ static void __devexit cy_pci_remove(struct pci_dev *pdev)
|
||||
pci_release_regions(pdev);
|
||||
|
||||
cinfo->base_addr = NULL;
|
||||
for (i = cinfo->first_line; i < cinfo->first_line +
|
||||
cinfo->nports; i++)
|
||||
for (channel = 0, i = cinfo->first_line; i < cinfo->first_line +
|
||||
cinfo->nports; i++, channel++) {
|
||||
tty_unregister_device(cy_serial_driver, i);
|
||||
tty_port_destroy(&cinfo->ports[channel].port);
|
||||
}
|
||||
cinfo->nports = 0;
|
||||
kfree(cinfo->ports);
|
||||
}
|
||||
|
Reference in New Issue
Block a user