mirror of
https://github.com/torvalds/linux
synced 2024-09-29 16:00:27 +00:00
uvcvideo v6.11 regression fix
-----BEGIN PGP SIGNATURE----- iJgEABYKAEAWIQTAnvhxs4J7QT+XHKnMPy2AAyfeZAUCZp5RHyIcbGF1cmVudC5w aW5jaGFydEBpZGVhc29uYm9hcmQuY29tAAoJEMw/LYADJ95kdtsBAPgqx8DgfhiN 5h1J5BeSrpmxbTDx9O0l5vpBjH+9LYS9AP4zJpCcTDsI1ikKEZAnge8fZ42Ja3NQ 7/e4PZ7JPDelBQ== =RHjG -----END PGP SIGNATURE----- Merge tag 'tags/fixes-media-uvc-20230722' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git uvcvideo v6.11 regression fix: fix custom control mapping probing Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
commit
e2ed53694e
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue