]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: uvcvideo: Use uvc_query_name in uvc_get_video_ctrl
authorXiong Nandi <xndchn@gmail.com>
Fri, 29 Nov 2024 15:17:23 +0000 (23:17 +0800)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 19 Dec 2024 14:44:43 +0000 (14:44 +0000)
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 <xndchn@gmail.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20241129151723.48275-1-xndchn@gmail.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/usb/uvc/uvc_video.c

index a260e9868e8b6417e4324fbb3fc865a1f2f6f79d..7efed64b81a2862e6a290e7bf43f506aaad4fc24 100644 (file)
@@ -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;
        }