| From 98a167e5a88227f6378e51a8d4e9a480167c1d5c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 18 Jun 2021 14:29:09 +0200 |
| Subject: media: uvcvideo: Return -EIO for control errors |
| |
| From: Ricardo Ribalda <ribalda@chromium.org> |
| |
| [ Upstream commit ffccdde5f0e17d2f0d788a9d831a027187890eaa ] |
| |
| The device is doing something unexpected with the control. Either because |
| the protocol is not properly implemented or there has been a HW error. |
| |
| Fixes v4l2-compliance: |
| |
| Control ioctls (Input 0): |
| fail: v4l2-test-controls.cpp(448): s_ctrl returned an error (22) |
| test VIDIOC_G/S_CTRL: FAIL |
| fail: v4l2-test-controls.cpp(698): s_ext_ctrls returned an error (22) |
| test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL |
| |
| Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> |
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/usb/uvc/uvc_video.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c |
| index 5d095b2a03464..96b85d66e7a87 100644 |
| --- a/drivers/media/usb/uvc/uvc_video.c |
| +++ b/drivers/media/usb/uvc/uvc_video.c |
| @@ -112,6 +112,11 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, |
| case 5: /* Invalid unit */ |
| case 6: /* Invalid control */ |
| case 7: /* Invalid Request */ |
| + /* |
| + * The firmware has not properly implemented |
| + * the control or there has been a HW error. |
| + */ |
| + return -EIO; |
| case 8: /* Invalid value within range */ |
| return -EINVAL; |
| default: /* reserved or unknown */ |
| -- |
| 2.33.0 |
| |
