From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Ricardo Ribalda <ribalda@chromium.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org, Hans Verkuil <hans.verkuil@cisco.com>
Subject: Re: [PATCH v9 20/22] uvcvideo: improve error handling in uvc_query_ctrl()
Date: Thu, 10 Jun 2021 20:14:02 +0300 [thread overview]
Message-ID: <YMJIWtvp2AkaRw8T@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20210326095840.364424-21-ribalda@chromium.org>
Hi Ricardo and Hans,
Thank you for the patch.
On Fri, Mar 26, 2021 at 10:58:38AM +0100, Ricardo Ribalda wrote:
> From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>
> - If __uvc_query_ctrl() failed with a non-EPIPE error, then
> report that with dev_err. If an error code is obtained, then
> report that with dev_dbg.
>
> - For error 2 (Wrong state) return -EACCES instead of -EILSEQ.
> EACCES is a much more appropriate error code. EILSEQ will return
> "Invalid or incomplete multibyte or wide character." in strerror(),
> which is a *very* confusing message.
I would have split the commit in two.
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
>
> I have changed a bit the patch from the original version.
>
> drivers/media/usb/uvc/uvc_video.c | 38 +++++++++++++++++--------------
> 1 file changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
> index b63c073ec30e..1c3a94d91724 100644
> --- a/drivers/media/usb/uvc/uvc_video.c
> +++ b/drivers/media/usb/uvc/uvc_video.c
> @@ -76,35 +76,31 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit,
> if (likely(ret == size))
> return 0;
>
> - dev_dbg(&dev->udev->dev,
> - "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n",
> - uvc_query_name(query), cs, unit, ret, size);
> -
> - if (ret != -EPIPE)
> - return ret;
> + if (ret < 0 && ret != -EPIPE)
> + goto err;
>
> + // reuse data[0] for request the error code.
C-style comments please.
s/for request/to request/
> tmp = *(u8 *)data;
> -
> ret = __uvc_query_ctrl(dev, UVC_GET_CUR, 0, intfnum,
> UVC_VC_REQUEST_ERROR_CODE_CONTROL, data, 1,
> UVC_CTRL_CONTROL_TIMEOUT);
> -
No need to drop the blank lines.
> error = *(u8 *)data;
> *(u8 *)data = tmp;
>
> - if (ret != 1)
> - return ret < 0 ? ret : -EPIPE;
> + if (ret != 1) {
> + ret = ret < 0 ? ret : -EPIPE;
> + goto err;
> + }
>
> - uvc_dbg(dev, CONTROL, "Control error %u\n", error);
> + dev_dbg(&dev->udev->dev,
Why not uvc_dbg ?
> + "Failed to query (%s) UVC control %u on unit %u: got error %u.\n",
> + uvc_query_name(query), cs, unit, error);
>
> switch (error) {
> - case 0:
> - /* Cannot happen - we received a STALL */
> - return -EPIPE;
> case 1: /* Not ready */
> return -EBUSY;
> case 2: /* Wrong state */
> - return -EILSEQ;
> + return -EACCES;
> case 3: /* Power */
> return -EREMOTE;
> case 4: /* Out of range */
> @@ -120,10 +116,18 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit,
> case 8: /* Invalid value within range */
> return -EINVAL;
> default: /* reserved or unknown */
> - break;
> + dev_err(&dev->udev->dev,
> + "Failed to query (%s) UVC control %u on unit %u: got error %u.\n",
> + uvc_query_name(query), cs, unit, error);
when debugging is enabled, this will print the error message a second
time, it's not very nice.
> + return -EPIPE;
> }
>
> - return -EPIPE;
> +err:
> + dev_err(&dev->udev->dev,
> + "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n",
> + uvc_query_name(query), cs, unit, ret, size);
> +
> + return ret;
> }
>
> static void uvc_fixup_video_ctrl(struct uvc_streaming *stream,
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2021-06-10 17:14 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 9:58 [PATCH v9 00/22] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-26 9:58 ` [PATCH v9 01/22] media: v4l2-ioctl: Fix check_ext_ctrls Ricardo Ribalda
2021-06-10 16:19 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 02/22] media: pvrusb2: Do not check for V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-06-10 17:29 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 03/22] media: uvcvideo: " Ricardo Ribalda
2021-06-10 16:21 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 04/22] media: v4l2-ioctl: S_CTRL output the right value Ricardo Ribalda
2021-06-10 16:23 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 05/22] media: uvcvideo: Remove s_ctrl and g_ctrl Ricardo Ribalda
2021-06-10 16:24 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 06/22] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-26 9:58 ` [PATCH v9 07/22] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-26 9:58 ` [PATCH v9 08/22] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-26 9:58 ` [PATCH v9 09/22] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-06-10 16:42 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 10/22] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-06-10 16:44 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 11/22] media: uvcvideo: Set unique vdev name based in type Ricardo Ribalda
2021-06-10 16:45 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 12/22] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-06-10 16:48 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 13/22] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-06-10 16:50 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 14/22] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-06-10 16:55 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 15/22] media: uvcvideo: Set error_idx during ctrl_commit errors Ricardo Ribalda
2021-06-10 17:05 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 16/22] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-27 11:23 ` Hans Verkuil
2021-06-10 17:28 ` Laurent Pinchart
2021-06-10 18:40 ` Ricardo Ribalda
2021-06-10 19:47 ` Ricardo Ribalda Delgado
2021-03-26 9:58 ` [PATCH v9 17/22] media: docs: Document the behaviour of uvcdriver Ricardo Ribalda
2021-03-27 11:19 ` Hans Verkuil
2021-03-27 12:01 ` Ricardo Ribalda
2021-03-27 12:03 ` Hans Verkuil
2021-06-10 17:08 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 18/22] media: uvcvideo: Downgrade control error messages Ricardo Ribalda
2021-03-27 11:19 ` Hans Verkuil
2021-06-10 16:59 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 19/22] uvcvideo: uvc_ctrl_is_accessible: check for INACTIVE Ricardo Ribalda
2021-03-27 12:26 ` Ricardo Ribalda Delgado
2021-03-26 9:58 ` [PATCH v9 20/22] uvcvideo: improve error handling in uvc_query_ctrl() Ricardo Ribalda
2021-06-10 17:14 ` Laurent Pinchart [this message]
2021-03-26 9:58 ` [PATCH v9 21/22] uvcvideo: don't spam the log in uvc_ctrl_restore_values() Ricardo Ribalda
2021-06-10 16:57 ` Laurent Pinchart
2021-03-26 9:58 ` [PATCH v9 22/22] uvc: use vb2 ioctl and fop helpers Ricardo Ribalda
2021-04-02 2:50 ` Tomasz Figa
2021-05-25 8:06 ` [PATCH v9 00/22] uvcvideo: Fix v4l2-compliance errors Tomasz Figa
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=YMJIWtvp2AkaRw8T@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=hans.verkuil@cisco.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=ribalda@chromium.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tfiga@chromium.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;
as well as URLs for NNTP newsgroup(s).