diff --git a/[refs] b/[refs]
index c5243ba49189..fb03cb6a03d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eef6e7b286e6dcf39a9b8c1d31477ee489451a8a
+refs/heads/master: a321846492f9ce3bab27f826e6579217fbc35732
diff --git a/trunk/drivers/staging/fwserial/fwserial.c b/trunk/drivers/staging/fwserial/fwserial.c
index 5d4d64a3ea81..99a2d2dbd322 100644
--- a/trunk/drivers/staging/fwserial/fwserial.c
+++ b/trunk/drivers/staging/fwserial/fwserial.c
@@ -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 @@ static int fwserial_create(struct fw_unit *unit)
 	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;
 }