From: Johan Hovold <johan@kernel.org>
To: Johan Hovold <johan@kernel.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 19/24] USB: serial: fix return value for unsupported ioctls
Date: Wed, 7 Apr 2021 12:39:20 +0200 [thread overview]
Message-ID: <20210407103925.829-20-johan@kernel.org> (raw)
In-Reply-To: <20210407103925.829-1-johan@kernel.org>
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")
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/usb-serial.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 27e3bb58c872..c311cc4fabee 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -502,7 +502,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,
@@ -514,7 +514,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,
@@ -526,7 +526,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;
}
/*
--
2.26.3
next prev parent reply other threads:[~2021-04-07 10:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 10:39 [PATCH 00/24] USB: serial: TIOCSSERIAL fixes and generic support Johan Hovold
2021-04-07 10:39 ` [PATCH 01/24] USB: serial: ark3116: fix TIOCGSERIAL implementation Johan Hovold
2021-04-07 10:39 ` [PATCH 02/24] USB: serial: f81232: " Johan Hovold
2021-04-07 10:39 ` [PATCH 03/24] USB: serial: f81534: " Johan Hovold
2021-04-07 10:39 ` [PATCH 04/24] USB: serial: ftdi_sio: " Johan Hovold
2021-04-07 10:39 ` [PATCH 05/24] USB: serial: io_edgeport: " Johan Hovold
2021-04-07 10:39 ` [PATCH 06/24] USB: serial: io_ti: " Johan Hovold
2021-04-07 10:39 ` [PATCH 07/24] USB: serial: mos7720: " Johan Hovold
2021-04-07 10:39 ` [PATCH 08/24] USB: serial: mos7840: " Johan Hovold
2021-04-07 10:39 ` [PATCH 09/24] USB: serial: opticon: " Johan Hovold
2021-04-07 10:39 ` [PATCH 10/24] USB: serial: pl2303: " Johan Hovold
2021-04-07 10:39 ` [PATCH 11/24] USB: serial: quatech2: " Johan Hovold
2021-04-07 10:39 ` [PATCH 12/24] USB: serial: ssu100: " Johan Hovold
2021-04-07 10:39 ` [PATCH 13/24] USB: serial: ti_usb_3410_5052: " Johan Hovold
2021-04-07 10:39 ` [PATCH 14/24] USB: serial: ti_usb_3410_5052: fix TIOCSSERIAL permission check Johan Hovold
2021-04-07 10:39 ` [PATCH 15/24] USB: serial: usb_wwan: fix TIOCSSERIAL jiffies conversions Johan Hovold
2021-04-07 10:39 ` [PATCH 16/24] USB: serial: usb_wwan: fix unprivileged TIOCCSERIAL Johan Hovold
2021-04-07 10:39 ` [PATCH 17/24] USB: serial: usb_wwan: fix TIOCGSERIAL implementation Johan Hovold
2021-04-07 10:39 ` [PATCH 18/24] USB: serial: whiteheat: " Johan Hovold
2021-04-07 10:39 ` Johan Hovold [this message]
2021-04-07 10:39 ` [PATCH 20/24] USB: serial: add generic support for TIOCSSERIAL Johan Hovold
2021-04-07 10:39 ` [PATCH 21/24] USB: serial: stop reporting legacy UART types Johan Hovold
2021-04-07 10:39 ` [PATCH 22/24] USB: serial: ftdi_sio: ignore baud_base changes Johan Hovold
2021-04-07 10:39 ` [PATCH 23/24] USB: serial: ftdi_sio: simplify TIOCGSERIAL permission check Johan Hovold
2021-04-07 10:39 ` [PATCH 24/24] USB: serial: ftdi_sio: clean up TIOCSSERIAL Johan Hovold
2021-04-07 15:23 ` [PATCH 00/24] USB: serial: TIOCSSERIAL fixes and generic support Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407103925.829-20-johan@kernel.org \
--to=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox