On Mon, Dec 02, 2024 at 03:44:57PM +0100, Hans de Goede wrote:
> On 2-Dec-24 3:24 PM, Ricardo Ribalda wrote:
> > ctrl->handle will only be different than NULL for controls that have
> > mappings. This is because that assignment is only done inside
> > uvc_ctrl_set() for mapped controls.
> >
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
>
> Thanks, patch looks good to me:
>
> Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
This should come before 2/5, otherwise that patch will be wrong about
the documented locking rule. I'm also fine with squashing this change in
2/5 (with an update to the commit message).
> > ---
> > drivers/media/usb/uvc/uvc_ctrl.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> > index 576e3854be91..e90bf2aeb5e4 100644
> > --- a/drivers/media/usb/uvc/uvc_ctrl.c
> > +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> > @@ -1672,10 +1672,8 @@ bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,
> > struct uvc_device *dev = chain->dev;
> > struct uvc_ctrl_work *w = &dev->async_ctrl;
> >
> > - if (list_empty(&ctrl->info.mappings)) {
> > - ctrl->handle = NULL;
> > + if (list_empty(&ctrl->info.mappings))
> > return false;
> > - }
> >
> > w->data = data;
> > w->urb = urb;
> >
--
Regards,
Laurent Pinchart
