From: Johan Hovold Date: Mon, 6 Mar 2017 16:36:38 +0000 (+0100) Subject: USB: serial: omninet: fix reference leaks at open X-Git-Tag: v3.2.89~6 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8b236342396140be22ab9b486c412666f161af78 USB: serial: omninet: fix reference leaks at open commit 30572418b445d85fcfe6c8fe84c947d2606767d8 upstream. This driver needlessly took another reference to the tty on open, a reference which was then never released on close. This lead to not just a leak of the tty, but also a driver reference leak that prevented the driver from being unloaded after a port had once been opened. Fixes: 4a90f09b20f4 ("tty: usb-serial krefs") Signed-off-by: Johan Hovold [bwh: Backported to 3.2: - The 'serial' variable is still needed for other initialisation - Adjust context] Signed-off-by: Ben Hutchings --- diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 5c7abfb9aea7..6665f5e59532 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c @@ -171,14 +171,10 @@ static int omninet_attach(struct usb_serial *serial) static int omninet_open(struct tty_struct *tty, struct usb_serial_port *port) { struct usb_serial *serial = port->serial; - struct usb_serial_port *wport; int result = 0; dbg("%s - port %d", __func__, port->number); - wport = serial->port[1]; - tty_port_tty_set(&wport->port, tty); - /* Start reading from the device */ usb_fill_bulk_urb(port->read_urb, serial->dev, usb_rcvbulkpipe(serial->dev,