media: uvcvideo: Remove a redundant check
authorGuennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Tue, 8 May 2018 15:07:42 +0000 (11:07 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 27 Jul 2018 10:39:57 +0000 (06:39 -0400)
Event subscribers cannot have a NULL file handle. They are only added
at a single location in the code, and the .fh pointer is used without
checking there.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/uvc/uvc_ctrl.c

index 4042cbd..12b5be6 100644 (file)
@@ -1229,9 +1229,9 @@ static void uvc_ctrl_send_event(struct uvc_fh *handle,
        uvc_ctrl_fill_event(handle->chain, &ev, ctrl, mapping, value, changes);
 
        list_for_each_entry(sev, &mapping->ev_subs, node) {
-               if (sev->fh && (sev->fh != &handle->vfh ||
+               if (sev->fh != &handle->vfh ||
                    (sev->flags & V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK) ||
-                   (changes & V4L2_EVENT_CTRL_CH_FLAGS)))
+                   (changes & V4L2_EVENT_CTRL_CH_FLAGS))
                        v4l2_event_queue_fh(sev->fh, &ev);
        }
 }