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

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

USB: serial: add tiocmiwait subdriver operation 



Add tiocmiwait operation to struct usb_serial_driver.

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

drivers/usb/serial/usb-serial.c

+11 −4
Original line number Diff line number Diff line
@@ -402,10 +402,17 @@ static int serial_ioctl(struct tty_struct *tty, 


	dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd);



	switch (cmd) {

	case TIOCMIWAIT:

		if (port->serial->type->tiocmiwait)

			retval = port->serial->type->tiocmiwait(tty, arg);

		break;

	default:

		if (port->serial->type->ioctl)

			retval = port->serial->type->ioctl(tty, cmd, arg);

		else

			retval = -ENOIOCTLCMD;

	}



	return retval;

}

include/linux/usb/serial.h

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ struct usb_serial_driver { 
	int  (*tiocmget)(struct tty_struct *tty);

	int  (*tiocmset)(struct tty_struct *tty,

			 unsigned int set, unsigned int clear);

	int  (*tiocmiwait)(struct tty_struct *tty, unsigned long arg);

	int  (*get_icount)(struct tty_struct *tty,

			struct serial_icounter_struct *icount);

	/* Called by the tty layer for port level work. There may or may not