diff mbox series

[v5,4/5] media: uvcvideo: Remove redundant NULL assignment

Message ID 20241202-uvc-fix-async-v5-4-6658c1fe312b@chromium.org (mailing list archive)
State New
Headers show
Series media: uvcvideo: Two +1 fixes for async controls | expand

Commit Message

Ricardo Ribalda Dec. 2, 2024, 2:24 p.m. UTC 
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@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/usb/uvc/uvc_ctrl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Hans de Goede Dec. 2, 2024, 2:44 p.m. UTC | #1 
Hi,

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@ideasonboard.com>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans



> ---
>  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;
>
Laurent Pinchart Dec. 3, 2024, 8:27 p.m. UTC | #2 
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@ideasonboard.com>
> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> 
> Thanks, patch looks good to me:
> 
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>

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;
> >
diff mbox series

Patch

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;