diff options
| author | Ricardo Ribalda <ribalda@chromium.org> | 2021-06-18 14:29:09 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-09-30 10:07:47 +0200 |
| commit | ffccdde5f0e17d2f0d788a9d831a027187890eaa (patch) | |
| tree | 1910f91da9e42b009e7b869b45748ed90ad75e47 /drivers/media/usb | |
| parent | 97a2777a96070afb7da5d587834086c0b586c8cc (diff) | |
| download | linux-stable-ffccdde5f0e17d2f0d788a9d831a027187890eaa.tar.gz linux-stable-ffccdde5f0e17d2f0d788a9d831a027187890eaa.tar.bz2 linux-stable-ffccdde5f0e17d2f0d788a9d831a027187890eaa.zip | |
media: uvcvideo: Return -EIO for control errors
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>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_video.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index e16464606b14..9f37eaf28ce7 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -115,6 +115,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 */ |