korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

USB: serial: fix return value for unsupported ioctls

Browse Source 
Drivers should return -ENOTTY ("Inappropriate I/O control operation")
when an ioctl isn't supported, while -EINVAL is used for invalid
arguments.

Fix up the TIOCMGET, TIOCMSET and TIOCGICOUNT helpers which returned
-EINVAL when a USB serial driver did not implement the corresponding
methods.

Note that the TIOCMGET and TIOCMSET helpers predate git and do not get a
corresponding Fixes tag below.

Fixes: d281da7ff6 ("tty: Make tiocgicount a handler")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2021-04-07 12:39:20 +02:00
parent 6f9f8aeab7
commit 5f92aee93a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ static int serial_tiocmget(struct tty_struct *tty)
if (port->serial->type->tiocmget)
return port->serial->type->tiocmget(tty);
return -EINVAL;
return -ENOTTY;
}
static int serial_tiocmset(struct tty_struct *tty,
@ -552,7 +552,7 @@ static int serial_tiocmset(struct tty_struct *tty,
if (port->serial->type->tiocmset)
return port->serial->type->tiocmset(tty, set, clear);
return -EINVAL;
return -ENOTTY;
}
static int serial_get_icount(struct tty_struct *tty,
@ -564,7 +564,7 @@ static int serial_get_icount(struct tty_struct *tty,
if (port->serial->type->get_icount)
return port->serial->type->get_icount(tty, icount);
return -EINVAL;
return -ENOTTY;
}
/*