Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a646855 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Return -EIO for control errors 



[ 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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ab7fca0e

drivers/media/usb/uvc/uvc_video.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */