Hi Hans,
Thank you for the patch.
On Tue, Jul 28, 2020 at 01:22:08PM +0200, Hans de Goede wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> Changes in v2:
> - Move the uvc_ctrl_get_flags() call for normal controls to uvc_ctrl_init_ctrl()
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index e399b9fad757..b78aba991212 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -2024,13 +2024,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 "
> @@ -2253,6 +2246,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;
> }
> }
--
Regards,
Laurent Pinchart
