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

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

USB: ark3116: switch to generic TIOCMIWAIT implementation 



Switch to the generic TIOCMIWAIT implementation which does not suffer
from the races involved when using the deprecated sleep_on functions.

This also fixes the issue with processes waiting for
modem-status-changes not being woken up at disconnect.

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

drivers/usb/serial/ark3116.c

+2 −28
Original line number Diff line number Diff line
@@ -426,33 +426,6 @@ static int ark3116_ioctl(struct tty_struct *tty, 
		if (copy_from_user(&serstruct, user_arg, sizeof(serstruct)))

			return -EFAULT;

		return 0;

	case TIOCMIWAIT:

		for (;;) {

			struct async_icount prev = port->icount;

			interruptible_sleep_on(&port->delta_msr_wait);

			/* see if a signal did it */

			if (signal_pending(current))

				return -ERESTARTSYS;



			if (port->serial->disconnected)

				return -EIO;



			if ((prev.rng == port->icount.rng) &&

			    (prev.dsr == port->icount.dsr) &&

			    (prev.dcd == port->icount.dcd) &&

			    (prev.cts == port->icount.cts))

				return -EIO;

			if ((arg & TIOCM_RNG &&

			     (prev.rng != port->icount.rng)) ||

			    (arg & TIOCM_DSR &&

			     (prev.dsr != port->icount.dsr)) ||

			    (arg & TIOCM_CD  &&

			     (prev.dcd != port->icount.dcd)) ||

			    (arg & TIOCM_CTS &&

			     (prev.cts != port->icount.cts)))

				return 0;

		}

		break;

	}



	return -ENOIOCTLCMD;
@@ -557,7 +530,7 @@ static void ark3116_update_msr(struct usb_serial_port *port, __u8 msr) 
			port->icount.dcd++;

		if (msr & UART_MSR_TERI)

			port->icount.rng++;

		wake_up_interruptible(&port->delta_msr_wait);

		wake_up_interruptible(&port->port.delta_msr_wait);

	}

}
@@ -697,6 +670,7 @@ static struct usb_serial_driver ark3116_device = { 
	.ioctl =		ark3116_ioctl,

	.tiocmget =		ark3116_tiocmget,

	.tiocmset =		ark3116_tiocmset,

	.tiocmiwait =		usb_serial_generic_tiocmiwait,

	.get_icount =		usb_serial_generic_get_icount,

	.open =			ark3116_open,

	.close =		ark3116_close,