media: uvcvideo: Fix uvc_ctrl_fixup_xu_info() not having any effect
Subsystems (3)
PATCH v2 1/2 media: uvcvideo: Fix uvc_ctrl_fixup_xu_info() not having any effect
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.
---
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(-)
drivers/media/usb/uvc/uvc_ctrl.c +7 -7
@@ -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 ; } }
Signature · 1 line
2.26.2
PATCH v2 2/2 media: uvcvideo: Cleanup uvc_ctrl_add_info() error handling
There is only 1 error exit in uvc_ctrl_add_info(), so using goto style error handling is not necessary. Also the kfree(ctrl->uvc_data) on error is not necessary, because the only error exit is for the kzalloc() of ctrl->uvc_data failing.
Remove all the error handling cruft and simply do "return -ENOMEM" on kzalloc() failure.
---
Changes in v2:
- new patch in v2 of this series
--- drivers/media/usb/uvc/uvc_ctrl.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +3 -10
@@ -2011,18 +2011,14 @@ int uvc_ctrl_restore_values(struct uvc_device *dev)static int uvc_ctrl_add_info (struct uvc_device *dev,struct uvc_control *ctrl,const struct uvc_control_info *info) { -int ret =0 ; - ctrl->info = *info;INIT_LIST_HEAD (&ctrl->info.mappings);/* Allocate an array to save control values (cur, def, max, etc.) */ ctrl->uvc_data =kzalloc (ctrl->info.size *UVC_CTRL_DATA_LAST +1 ,GFP_KERNEL ); -if (ctrl->uvc_data ==NULL ) { - ret = -ENOMEM ; - goto done; - } +if (!ctrl->uvc_data) +return -ENOMEM ; ctrl->initialized =1 ;
@@ -2030,10 +2026,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl,"entity %u\n" , ctrl->info.entity, ctrl->info.selector, dev->udev->devpath, ctrl->entity->id); -done: -if (ret <0 ) -kfree (ctrl->uvc_data); -return ret; +return 0 ; }/*
Signature · 1 line
2.26.2
Re: [PATCH v2 2/2] media: uvcvideo: Cleanup uvc_ctrl_add_info() error handling
Hi Hans,
Thank you for the patch.
Quoted 9 lines · Hans de Goede
There is only 1 error exit in
uvc_ctrl_add_info(), so using goto style error handling is not necessary. Also thekfree(ctrl->uvc_data)on error is not necessary, because the only error exit is for thekzalloc()ofctrl->uvc_datafailing.Remove all the error handling cruft and simply do "return
-ENOMEM" onkzalloc()failure.Signed-off-by Hans de Goede <[email protected]>
Quoted 44 lines
---
Changes in v2:
- new patch in v2 of this series--- drivers/media/usb/uvc/uvc_ctrl.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +3
-10@@ -2011,18 +2011,14 @@ int uvc_ctrl_restore_values(struct uvc_device *dev)static int uvc_ctrl_add_info (struct uvc_device *dev,struct uvc_control *ctrl,const struct uvc_control_info *info) { -int ret =0 ; - ctrl->info = *info;INIT_LIST_HEAD (&ctrl->info.mappings);/* Allocate an array to save control values (cur, def, max, etc.) */ ctrl->uvc_data =kzalloc (ctrl->info.size *UVC_CTRL_DATA_LAST +1 ,GFP_KERNEL ); -if (ctrl->uvc_data ==NULL ) { - ret = -ENOMEM ; - goto done; - } +if (!ctrl->uvc_data) +return -ENOMEM ; ctrl->initialized =1 ;@@ -2030,10 +2026,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl,"entity %u\n" , ctrl->info.entity, ctrl->info.selector, dev->udev->devpath, ctrl->entity->id); -done: -if (ret <0 ) -kfree (ctrl->uvc_data); -return ret; +return 0 ; }/*
Signature · 3 lines
Regards, Laurent Pinchart
Hi Hans,
Thank you for the patch.
Quoted 12 lines · Hans de Goede
uvc_ctrl_add_info()callsuvc_ctrl_get_flags()which will override the fixed-up flags set byuvc_ctrl_fixup_xu_info().
uvc_ctrl_init_xu_ctrl()already callsuvc_ctrl_get_flags()before callinguvc_ctrl_add_info(), so theuvc_ctrl_get_flags()call inuvc_ctrl_add_info()is not necessary for xu ctrls.This commit moves the
uvc_ctrl_get_flags()call for normal controls fromuvc_ctrl_add_info()touvc_ctrl_init_ctrl(), so that we no longer calluvc_ctrl_get_flags()twice for xu controls and so that we no longer override the fixed-up flags set byuvc_ctrl_fixup_xu_info().
Quoted 6 lines
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.Signed-off-by Hans de Goede <[email protected]>
Quoted 39 lines
---
Changes in v2:
- Move theuvc_ctrl_get_flags()call for normal controls touvc_ctrl_init_ctrl()--- drivers/media/usb/uvc/uvc_ctrl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +7
-7@@ -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 ; } }
Signature · 3 lines
Regards, Laurent Pinchart
Hi,
Quoted 17 lines · Laurent Pinchart
Hi Hans,
Thank you for the patch.
Quoted 12 lines · Hans de Goede
uvc_ctrl_add_info()callsuvc_ctrl_get_flags()which will override the fixed-up flags set byuvc_ctrl_fixup_xu_info().
uvc_ctrl_init_xu_ctrl()already callsuvc_ctrl_get_flags()before callinguvc_ctrl_add_info(), so theuvc_ctrl_get_flags()call inuvc_ctrl_add_info()is not necessary for xu ctrls.This commit moves the
uvc_ctrl_get_flags()call for normal controls fromuvc_ctrl_add_info()touvc_ctrl_init_ctrl(), so that we no longer calluvc_ctrl_get_flags()twice for xu controls and so that we no longer override the fixed-up flags set byuvc_ctrl_fixup_xu_info().
Quoted 8 lines
Quoted 6 lines
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.Signed-off-by Hans de Goede <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>
The first patch in this series is a bug-fix for a real-world issue, and I'm still not seeing this in -next, let alone in a fixed branch for Linus.
Can we get these 2 patches merged please?
Regards,
Hans
Quoted 41 lines
Quoted 40 lines
---
Changes in v2:
- Move theuvc_ctrl_get_flags()call for normal controls touvc_ctrl_init_ctrl()--- drivers/media/usb/uvc/uvc_ctrl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +7
-7@@ -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 ; } }
Laurent Pinchart
maintainerHi Hans,
Quoted 21 lines · Hans de Goede
Quoted 20 lines · Laurent Pinchart
Quoted 18 lines · Hans de Goede
uvc_ctrl_add_info()callsuvc_ctrl_get_flags()which will override the fixed-up flags set byuvc_ctrl_fixup_xu_info().
uvc_ctrl_init_xu_ctrl()already callsuvc_ctrl_get_flags()before callinguvc_ctrl_add_info(), so theuvc_ctrl_get_flags()call inuvc_ctrl_add_info()is not necessary for xu ctrls.This commit moves the
uvc_ctrl_get_flags()call for normal controls fromuvc_ctrl_add_info()touvc_ctrl_init_ctrl(), so that we no longer calluvc_ctrl_get_flags()twice for xu controls and so that we no longer override the fixed-up flags set byuvc_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.Signed-off-by Hans de Goede <[email protected]>
Quoted 6 lines
Quoted 1 line
Reviewed-by Laurent Pinchart <[email protected]>The first patch in this series is a bug-fix for a real-world issue, and I'm still not seeing this in -next, let alone in a fixed branch for Linus.
Can we get these 2 patches merged please?
I've just sent the pull request for uvcvideo, it should get merged this week or the next one and will make it for v5.10. I apologize for the delay.
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
---
Changes in v2:
- Move theuvc_ctrl_get_flags()call for normal controls touvc_ctrl_init_ctrl()--- drivers/media/usb/uvc/uvc_ctrl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/media/usb/uvc/uvc_ctrl.c +7
-7@@ -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 ; } }
Signature · 3 lines
Regards, Laurent Pinchart