OSDN Git Service

USB: serial: fix return value for unsupported ioctls
authorJohan Hovold <johan@kernel.org>
Wed, 7 Apr 2021 10:39:20 +0000 (12:39 +0200)
committerJohan Hovold <johan@kernel.org>
Thu, 8 Apr 2021 07:46:01 +0000 (09:46 +0200)
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: d281da7ff6f7 ("tty: Make tiocgicount a handler")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/usb-serial.c

index aaae71a..f53a830 100644 (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;
 }
 
 /*