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

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

USB: oti6858: fix abuse of interface data 



Fix abuse of interface data which was used to signal device disconnect.

Note that neither tiocmset or tiocmget need to check for disconnect as
they do not access the device.

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

drivers/usb/serial/oti6858.c

+0 −6
Original line number Diff line number Diff line
@@ -633,9 +633,6 @@ static int oti6858_tiocmset(struct tty_struct *tty, 
	dbg("%s(port = %d, set = 0x%08x, clear = 0x%08x)",

				__func__, port->number, set, clear);



	if (!usb_get_intfdata(port->serial->interface))

		return -ENODEV;



	/* FIXME: check if this is correct (active high/low) */

	spin_lock_irqsave(&priv->lock, flags);

	control = priv->pending_setup.control;
@@ -665,9 +662,6 @@ static int oti6858_tiocmget(struct tty_struct *tty) 


	dbg("%s(port = %d)", __func__, port->number);



	if (!usb_get_intfdata(port->serial->interface))

		return -ENODEV;



	spin_lock_irqsave(&priv->lock, flags);

	pin_state = priv->status.pin_state & PIN_MASK;

	spin_unlock_irqrestore(&priv->lock, flags);