1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index f17f92b86a30..0f415dade05a 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -821,8 +821,8 @@ static void send_event(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl, u32 changes)
         fill_event(&ev, ctrl, changes);
 
         list_for_each_entry(sev, &ctrl->ev_subs, node)
-                if (sev->fh && (sev->fh != fh ||
-                                (sev->flags & V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK)))
+                if (sev->fh != fh ||
+                    (sev->flags & V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK))
                         v4l2_event_queue_fh(sev->fh, &ev);
 }
 
@@ -947,6 +947,7 @@ static void new_to_cur(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl,
                         if (ctrl->cluster[0]->has_volatiles)
                                 ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
                 }
+                fh = NULL;
         }
         if (changed || update_inactive) {
                 /* If a control was changed that was not one of the controls