leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: serial: add tiocmiwait subdriver operation

Browse Source 
Add tiocmiwait operation to struct usb_serial_driver.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-03-21 12:36:51 +01:00 committed by Greg Kroah-Hartman
parent 5cb27dde2e
commit 143d9d9616
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/serial/usb-serial.c
View File

@ -402,10 +402,17 @@ static int serial_ioctl(struct tty_struct *tty,
dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd); dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd);
if (port->serial->type->ioctl) switch (cmd) {
retval = port->serial->type->ioctl(tty, cmd, arg); case TIOCMIWAIT:
else if (port->serial->type->tiocmiwait)
retval = -ENOIOCTLCMD; 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; return retval;
} }

1
include/linux/usb/serial.h
View File

@ -272,6 +272,7 @@ struct usb_serial_driver {
int (*tiocmget)(struct tty_struct *tty); int (*tiocmget)(struct tty_struct *tty);
int (*tiocmset)(struct tty_struct *tty, int (*tiocmset)(struct tty_struct *tty,
unsigned int set, unsigned int clear); unsigned int set, unsigned int clear);
int (*tiocmiwait)(struct tty_struct *tty, unsigned long arg);
int (*get_icount)(struct tty_struct *tty, int (*get_icount)(struct tty_struct *tty,
struct serial_icounter_struct *icount); struct serial_icounter_struct *icount);
/* Called by the tty layer for port level work. There may or may not /* Called by the tty layer for port level work. There may or may not