github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: uvcvideo: Return -EIO for control errors

Browse Source 
[ Upstream commit ffccdde5f0 ]

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>
This commit is contained in:
Ricardo Ribalda 2021-06-18 14:29:09 +02:00 committed by Greg Kroah-Hartman
parent 2052c4cebc
commit d934941640
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/usb/uvc/uvc_video.c
View File

@ -112,6 +112,11 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit,
case 5: /* Invalid unit */ case 5: /* Invalid unit */
case 6: /* Invalid control */ case 6: /* Invalid control */
case 7: /* Invalid Request */ 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 */ case 8: /* Invalid value within range */
return -EINVAL; return -EINVAL;
default: /* reserved or unknown */ default: /* reserved or unknown */