diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2018-09-12 18:37:18 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-10-13 00:50:47 -0400 |
| commit | a3096199226c2e4dc019f21c1bed6e96092d4a71 (patch) | |
| tree | ee7459664622cb6610c0b74a80d865e1e871e7c8 /drivers/tty/tty_io.c | |
| parent | dgnc: break-related ioctls won't reach ->ioctl() (diff) | |
| download | linux-dev-a3096199226c2e4dc019f21c1bed6e96092d4a71.tar.xz linux-dev-a3096199226c2e4dc019f21c1bed6e96092d4a71.zip | |
remove fallback to drivers for TIOCGICOUNT
none of them handles it anyway.
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index ccc0055b2dfc..1a55c3e20299 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2606,11 +2606,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case TIOCMBIS: return tty_tiocmset(tty, cmd, p); case TIOCGICOUNT: - retval = tty_tiocgicount(tty, p); - /* For the moment allow fall through to the old method */ - if (retval != -EINVAL) - return retval; - break; + return tty_tiocgicount(tty, p); case TCFLSH: switch (arg) { case TCIFLUSH: |