From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org
Cc: Ricardo Ribalda <ribalda@chromium.org>,
Hans Verkuil <hans.verkuil@cisco.com>
Subject: [PATCH 2/4] media: uvcvideo: improve error logging in uvc_query_ctrl()
Date: Thu, 9 Sep 2021 17:00:44 +0200 [thread overview]
Message-ID: <20210909150046.57615-3-ribalda@chromium.org> (raw)
In-Reply-To: <20210909150046.57615-1-ribalda@chromium.org>
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.
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/usb/uvc/uvc_video.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 9f37eaf28ce7..dfea967309f2 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -79,13 +79,14 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit,
if (likely(ret == size))
return 0;
- 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);
-
- if (ret != -EPIPE)
+ if (ret != -EPIPE) {
+ 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;
+ }
+ /* reuse data[0] to request the error code. */
tmp = *(u8 *)data;
ret = __uvc_query_ctrl(dev, UVC_GET_CUR, 0, intfnum,
--
2.33.0.153.gba50c8fa24-goog
next prev parent reply other threads:[~2021-09-09 15:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 15:00 [PATCH 0/4] Follow-up patches for uvc v4l2-compliance Ricardo Ribalda
2021-09-09 15:00 ` [PATCH 1/4] media: uvcvideo: uvc_ctrl_is_accessible: check for INACTIVE Ricardo Ribalda
2021-09-09 15:00 ` Ricardo Ribalda [this message]
2021-09-09 15:00 ` [PATCH 3/4] media: uvcvideo: Return -EACCES for Wrong state error Ricardo Ribalda
2021-09-09 15:00 ` [PATCH 4/4] media: uvcvideo: Do not return positive errors in uvc_query_ctrl() Ricardo Ribalda
2021-11-11 20:41 ` [PATCH 0/4] Follow-up patches for uvc v4l2-compliance James Hilliard
2021-11-11 20:52 ` Ricardo Ribalda
2021-11-11 21:22 ` James Hilliard
2021-11-11 21:27 ` Ricardo Ribalda
2021-11-11 22:04 ` James Hilliard
2021-11-12 10:09 ` Ricardo Ribalda
2021-11-12 10:45 ` Hans Verkuil
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=20210909150046.57615-3-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=hans.verkuil@cisco.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.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).