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

USB: pl2303: remove disconnect test from tiocmset 



Remove unnecessary disconnect test in tiocmset. No ioctls will be made
after disconnect returns.

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

drivers/usb/serial/pl2303.c

+4 −11
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static int pl2303_tiocmset(struct tty_struct *tty, 
			   unsigned int set, unsigned int clear)

{

	struct usb_serial_port *port = tty->driver_data;

	struct usb_serial *serial = port->serial;

	struct pl2303_private *priv = usb_get_serial_port_data(port);

	unsigned long flags;

	u8 control;
@@ -549,17 +548,11 @@ static int pl2303_tiocmset(struct tty_struct *tty, 
	control = priv->line_control;

	spin_unlock_irqrestore(&priv->lock, flags);



	mutex_lock(&serial->disc_mutex);

	if (!serial->disconnected) {

	ret = pl2303_set_control_lines(port, control);

	if (ret)

			ret = usb_translate_errors(ret);

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&serial->disc_mutex);

		return usb_translate_errors(ret);



	return ret;

	return 0;

}



static int pl2303_tiocmget(struct tty_struct *tty)