diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:36:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:50:50 -0700 |
| commit | 143d9d961608b737d90a813deaaf91affb41c83c (patch) | |
| tree | 5ee70e765be90948e9a6afb6f346e15326eb676d /drivers/usb/serial/usb-serial.c | |
| parent | 5cb27dde2e8b7bcbdce6de270c73c021a65caff8 (diff) | |
| download | talos-op-linux-143d9d961608b737d90a813deaaf91affb41c83c.tar.gz talos-op-linux-143d9d961608b737d90a813deaaf91affb41c83c.zip | |
USB: serial: add tiocmiwait subdriver operation
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>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 0b39d013c505..ada400d6594b 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -402,10 +402,17 @@ static int serial_ioctl(struct tty_struct *tty, dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd); - if (port->serial->type->ioctl) - retval = port->serial->type->ioctl(tty, cmd, arg); - else - retval = -ENOIOCTLCMD; + 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; } |
