Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30d9d42e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cyberjack: fix disconnect handling 



Make sure the interrupt urb submitted in port_probe is killed in
port_remove.

The interrupt-urb completion handler references the port and may get
called after port_remove has returned and the port has been
unregistered (although this is currently prevented by usb-serial core as
we are using a non-private urb).

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3452f5e

drivers/usb/serial/cyberjack.c

+2 −10
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#define CYBERJACK_PRODUCT_ID	0x0100



/* Function prototypes */

static void cyberjack_disconnect(struct usb_serial *serial);

static int cyberjack_port_probe(struct usb_serial_port *port);

static int cyberjack_port_remove(struct usb_serial_port *port);

static int  cyberjack_open(struct tty_struct *tty,
@@ -79,7 +78,6 @@ static struct usb_serial_driver cyberjack_device = { 
	.description =		"Reiner SCT Cyberjack USB card reader",

	.id_table =		id_table,

	.num_ports =		1,

	.disconnect =		cyberjack_disconnect,

	.port_probe =		cyberjack_port_probe,

	.port_remove =		cyberjack_port_remove,

	.open =			cyberjack_open,
@@ -130,20 +128,14 @@ static int cyberjack_port_remove(struct usb_serial_port *port) 
{

	struct cyberjack_private *priv;



	usb_kill_urb(port->interrupt_in_urb);



	priv = usb_get_serial_port_data(port);

	kfree(priv);



	return 0;

}



static void cyberjack_disconnect(struct usb_serial *serial)

{

	int i;



	for (i = 0; i < serial->num_ports; ++i)

		usb_kill_urb(serial->port[i]->interrupt_in_urb);

}



static int  cyberjack_open(struct tty_struct *tty,

					struct usb_serial_port *port)

{