On Mon, 22 Jul 2024 at 14:22, Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:

On Mon, Jul 22, 2024 at 11:52:26AM +0000, Ricardo Ribalda wrote:

...

Custom control mapping introduced a bug, where the filter function was applied to every single control.

Fix it so it is only applied to the matching controls.

The following dmesg errors during probe are now fixed:

usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c) usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1). usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1).

Reported-by: Paul Menzen pmenzel@molgen.mpg.de Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@mol... Cc: stable@vger.kernel.org Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") Signed-off-by: Ricardo Ribalda ribalda@chromium.org

I'll add

Tested-by: Paul Menzel pmenzel@molgen.mpg.de

from v1 and fix the reported-by tag.

Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com

Thanks :)

...

---

Paul, could you check if this fixes your issue, thanks!

Changes in v2:

• Replace !(A && B) with (!A || !B)
• Add error message to commit message
• Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chro...

---

drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 0136df5732ba..4fe26e82e3d1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i];

•         if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) ||
  

•             ctrl->info.selector != mapping->selector)
  

•                 continue;
  

•         /* Let the device provide a custom mapping. */
          if (mapping->filter_mapping) {
                  mapping = mapping->filter_mapping(chain, ctrl);
  

@@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, continue; }

•         if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
  

•             ctrl->info.selector == mapping->selector)
  

•                 __uvc_ctrl_add_mapping(chain, ctrl, mapping);
  

•         __uvc_ctrl_add_mapping(chain, ctrl, mapping);
  }
  

}

---

base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2 change-id: 20240722-fix-filter-mapping-18477dc69048

-- Regards,

Laurent Pinchart