On Fri Nov 29 23:17:23 2024 +0800, Xiong Nandi wrote:
> uvc_query_name was introduced to print query name in uvc_query_ctrl.
> So we can also use it in uvc_get_video_ctrl.
> 
> Signed-off-by: Xiong Nandi <xnd...@gmail.com>
> Reviewed-by: Ricardo Ribalda <riba...@chromium.org>
> Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Link: https://lore.kernel.org/r/20241129151723.48275-1-xnd...@gmail.com
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>

Patch committed.

Thanks,
Mauro Carvalho Chehab

 drivers/media/usb/uvc/uvc_video.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

---

diff --git a/drivers/media/usb/uvc/uvc_video.c 
b/drivers/media/usb/uvc/uvc_video.c
index a260e9868e8b..7efed64b81a2 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -322,8 +322,9 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
                goto out;
        } else if (ret != size) {
                dev_err(&stream->intf->dev,
-                       "Failed to query (%u) UVC %s control : %d (exp. %u).\n",
-                       query, probe ? "probe" : "commit", ret, size);
+                       "Failed to query (%s) UVC %s control : %d (exp. %u).\n",
+                       uvc_query_name(query), probe ? "probe" : "commit",
+                       ret, size);
                ret = (ret == -EPROTO) ? -EPROTO : -EIO;
                goto out;
        }

Reply via email to