2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index f1739526820f..d0f95482f40e 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -1145,8 +1145,10 @@ int gserial_setup(struct usb_gadget *g, unsigned count)
 
         return status;
 fail:
-        while (count--)
+        while (count--) {
+                tty_port_destroy(&ports[count].port->port);
                 kfree(ports[count].port);
+        }
         put_tty_driver(gs_tty_driver);
         gs_tty_driver = NULL;
         return status;
@@ -1200,6 +1202,7 @@ void gserial_cleanup(void)
 
                 WARN_ON(port->port_usb != NULL);
 
+                tty_port_destroy(&port->port);
                 kfree(port);
         }
         n_ports = 0;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 73b8e0569164..64bda135ba7e 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -597,6 +597,7 @@ static void port_release(struct device *dev)
         kfifo_free(&port->write_fifo);
         kfree(port->interrupt_in_buffer);
         kfree(port->interrupt_out_buffer);
+        tty_port_destroy(&port->port);
         kfree(port);
 }