Commit 0a77d44c authored Jul 28, 2020 by Hans de Goede Committed by Greg Kroah-Hartman Nov 05, 2020

media: uvcvideo: Fix uvc_ctrl_fixup_xu_info() not having any effect



commit 93df48d37c3f03886d84831992926333e7810640 upstream.

uvc_ctrl_add_info() calls uvc_ctrl_get_flags() which will override
the fixed-up flags set by uvc_ctrl_fixup_xu_info().

uvc_ctrl_init_xu_ctrl() already calls uvc_ctrl_get_flags() before
calling uvc_ctrl_add_info(), so the uvc_ctrl_get_flags() call in
uvc_ctrl_add_info() is not necessary for xu ctrls.

This commit moves the uvc_ctrl_get_flags() call for normal controls
from uvc_ctrl_add_info() to uvc_ctrl_init_ctrl(), so that we no longer
call uvc_ctrl_get_flags() twice for xu controls and so that we no longer
override the fixed-up flags set by uvc_ctrl_fixup_xu_info().

This fixes the xu motor controls not working properly on a Logitech
046d:08cc, and presumably also on the other Logitech models which have
a quirk for this in the uvc_ctrl_fixup_xu_info() function.

Cc: stable@vger.kernel.org
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c780aac6

drivers/media/usb/uvc/uvc_ctrl.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -2038,13 +2038,6 @@ static int uvc_ctrl_add_info(struct uvc_device dev, struct uvc_control ctrl,
		goto done;
		}

		/*
		* Retrieve control flags from the device. Ignore errors and work with
		* default flag values from the uvc_ctrl array when the device doesn't
		* properly implement GET_INFO on standard controls.
		*/
		uvc_ctrl_get_flags(dev, ctrl, &ctrl->info);

		ctrl->initialized = 1;

		uvc_trace(UVC_TRACE_CONTROL, "Added control %pUl/%u to device %s "
		@@ -2267,6 +2260,13 @@ static void uvc_ctrl_init_ctrl(struct uvc_device dev, struct uvc_control ctrl)
		if (uvc_entity_match_guid(ctrl->entity, info->entity) &&
		ctrl->index == info->index) {
		uvc_ctrl_add_info(dev, ctrl, info);
		/*
		* Retrieve control flags from the device. Ignore errors
		* and work with default flag values from the uvc_ctrl
		* array when the device doesn't properly implement
		* GET_INFO on standard controls.
		*/
		uvc_ctrl_get_flags(dev, ctrl, &ctrl->info);
		break;
		}
		}