staging/fwserial: Destruct embedded tty_port on teardown
authorPeter Hurley <peter@hurleysoftware.com>
Wed, 28 Nov 2012 02:37:11 +0000 (21:37 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Nov 2012 16:45:17 +0000 (08:45 -0800)
For TTY drivers that manage the port lifetime, the tty_port should
to be specifically destructed when the port lifetime ends. Now that
a method has been added to do this, use it.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
drivers/staging/fwserial/fwserial.c

index 5d4d64a..99a2d2d 100644 (file)
@@ -955,6 +955,7 @@ static void fwserial_destroy(struct kref *kref)
        for (j = 0; j < num_ports; ++j) {
                fw_core_remove_address_handler(&ports[j]->rx_handler);
                dma_fifo_free(&ports[j]->tx_fifo);
+               tty_port_destroy(&ports[j]->port);
                kfree(ports[j]);
        }
        kfree(serial);
@@ -2369,8 +2370,10 @@ unregister_ttys:
        return err;
 
 free_ports:
-       for (--i; i >= 0; --i)
+       for (--i; i >= 0; --i) {
+               tty_port_destroy(&serial->ports[i]->port);
                kfree(serial->ports[i]);
+       }
        kfree(serial);
        return err;
 }