Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / function / u_serial.c

diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 42894f58016eab5fae91534cdefec3fc3bb77e3e..f7771d86ad6c8d19e2016773c1b5ba4b2f3f33eb 100644 (file)
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -877,7 +877,6 @@ static void gs_close(struct tty_struct *tty, struct file *file)
        else
                gs_buf_clear(&port->port_write_buf);
 
-       tty->driver_data = NULL;
        port->port.tty = NULL;
 
        port->openclose = false;
@@ -1226,7 +1225,6 @@ int gserial_connect(struct gserial *gser, u8 port_num)
 
 fail_out:
        usb_ep_disable(gser->in);
-       gser->in->driver_data = NULL;
        return status;
 }
 EXPORT_SYMBOL_GPL(gserial_connect);
@@ -1266,10 +1264,7 @@ void gserial_disconnect(struct gserial *gser)
 
        /* disable endpoints, aborting down any active I/O */
        usb_ep_disable(gser->out);
-       gser->out->driver_data = NULL;
-
        usb_ep_disable(gser->in);
-       gser->in->driver_data = NULL;
 
        /* finally, free any unused/unusable I/O buffers */
        spin_lock_irqsave(&port->port_lock, flags);