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

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

USB: io_edgeport: switch to generic TIOCMIWAIT implementation 



Switch to the generic TIOCMIWAIT implementation.

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 d36a7712

drivers/usb/serial/io_edgeport.c

+1 −34
Original line number Original line Diff line number Diff line
@@ -1618,8 +1618,6 @@ static int edge_ioctl(struct tty_struct *tty, 
	struct usb_serial_port *port = tty->driver_data;

	struct usb_serial_port *port = tty->driver_data;

	DEFINE_WAIT(wait);

	DEFINE_WAIT(wait);

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	struct async_icount cnow;

	struct async_icount cprev;





	dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);

	dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
@@ -1631,37 +1629,6 @@ static int edge_ioctl(struct tty_struct *tty, 
	case TIOCGSERIAL:

	case TIOCGSERIAL:

		dev_dbg(&port->dev, "%s (%d) TIOCGSERIAL\n", __func__,  port->number);

		dev_dbg(&port->dev, "%s (%d) TIOCGSERIAL\n", __func__,  port->number);

		return get_serial_info(edge_port, (struct serial_struct __user *) arg);

		return get_serial_info(edge_port, (struct serial_struct __user *) arg);



	case TIOCMIWAIT:

		dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__,  port->number);

		cprev = port->icount;

		while (1) {

			prepare_to_wait(&port->delta_msr_wait,

						&wait, TASK_INTERRUPTIBLE);

			schedule();

			finish_wait(&port->delta_msr_wait, &wait);

			/* see if a signal did it */

			if (signal_pending(current))

				return -ERESTARTSYS;



			if (port->serial->disconnected)

				return -EIO;



			cnow = port->icount;

			if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&

			    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)

				return -EIO; /* no change => error */

			if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||

			    ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||

			    ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||

			    ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {

				return 0;

			}

			cprev = cnow;

		}

		/* NOTREACHED */

		break;



	}

	}

	return -ENOIOCTLCMD;

	return -ENOIOCTLCMD;

}

}
@@ -2022,7 +1989,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 newMsr) 
			icount->dcd++;

			icount->dcd++;

		if (newMsr & EDGEPORT_MSR_DELTA_RI)

		if (newMsr & EDGEPORT_MSR_DELTA_RI)

			icount->rng++;

			icount->rng++;

		wake_up_interruptible(&edge_port->port->delta_msr_wait);

		wake_up_interruptible(&edge_port->port->port.delta_msr_wait);

	}

	}





	/* Save the new modem status */

	/* Save the new modem status */

drivers/usb/serial/io_tables.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ static struct usb_serial_driver edgeport_2port_device = { 
	.set_termios		= edge_set_termios,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.write_room		= edge_write_room,
@@ -147,6 +148,7 @@ static struct usb_serial_driver edgeport_4port_device = { 
	.set_termios		= edge_set_termios,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.write_room		= edge_write_room,
@@ -178,6 +180,7 @@ static struct usb_serial_driver edgeport_8port_device = { 
	.set_termios		= edge_set_termios,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.write_room		= edge_write_room,
@@ -209,6 +212,7 @@ static struct usb_serial_driver epic_device = { 
	.set_termios		= edge_set_termios,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.write_room		= edge_write_room,