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

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

USB: mos7840: remove bogus disconnect test in close 



Remove bogus (and unnecessary) test for serial->dev being NULL in close.

The device is never cleared, and close is never called after a completed
disconnect anyway.

Simplify urb killing, and remove some related debug and dead code while
at it.

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

drivers/usb/serial/mos7840.c

+6 −22
Original line number Original line Diff line number Diff line
@@ -1223,25 +1223,10 @@ static void mos7840_close(struct usb_serial_port *port) 
		}

		}

	}

	}





	/* While closing port, shutdown all bulk read, write  *

	 * and interrupt read if they exists                  */

	if (serial->dev) {

		if (mos7840_port->write_urb) {

			dev_dbg(&port->dev, "%s", "Shutdown bulk write\n");

	usb_kill_urb(mos7840_port->write_urb);

	usb_kill_urb(mos7840_port->write_urb);

		}

		if (mos7840_port->read_urb) {

			dev_dbg(&port->dev, "%s", "Shutdown bulk read\n");

	usb_kill_urb(mos7840_port->read_urb);

	usb_kill_urb(mos7840_port->read_urb);

	mos7840_port->read_urb_busy = false;

	mos7840_port->read_urb_busy = false;

		}



		if ((&mos7840_port->control_urb)) {

			dev_dbg(&port->dev, "%s", "Shutdown control read\n");

			/*/      usb_kill_urb (mos7840_port->control_urb); */

		}

	}

/*      if(mos7840_port->ctrl_buf != NULL) */

/*              kfree(mos7840_port->ctrl_buf); */

	port0->open_ports--;

	port0->open_ports--;

	dev_dbg(&port->dev, "%s in close%d:in port%d\n", __func__, port0->open_ports, port->number);

	dev_dbg(&port->dev, "%s in close%d:in port%d\n", __func__, port0->open_ports, port->number);

	if (port0->open_ports == 0) {

	if (port0->open_ports == 0) {
@@ -1330,7 +1315,6 @@ static void mos7840_break(struct tty_struct *tty, int break_state) 
	if (mos7840_port == NULL)

	if (mos7840_port == NULL)

		return;

		return;





	if (serial->dev)

	/* flush and block until tx is empty */

	/* flush and block until tx is empty */

	mos7840_block_until_chase_response(tty, mos7840_port);

	mos7840_block_until_chase_response(tty, mos7840_port);