summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiong Nandi <xndchn@gmail.com>2024-11-29 18:17:23 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2024-12-19 17:44:43 +0300
commit7309f3e2b7fd2b7a9b175d0da565427a0c007287 (patch)
tree3f3375a11c7a658a784700c518d1bf3d82e2bbc3
parent060950f7f74ef242ce9eec837a75a53b379959f0 (diff)
downloadlinux-7309f3e2b7fd2b7a9b175d0da565427a0c007287.tar.xz
media: uvcvideo: Use uvc_query_name in uvc_get_video_ctrl
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>
-rw-r--r--drivers/media/usb/uvc/uvc_video.c5
1 files 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;
}