From patchwork Tue May 8 15:07:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 49379 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fG4DX-0006yE-SV; Tue, 08 May 2018 15:07:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932734AbeEHPHt (ORCPT + 1 other); Tue, 8 May 2018 11:07:49 -0400 Received: from mout.gmx.net ([212.227.15.18]:41013 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932719AbeEHPHr (ORCPT ); Tue, 8 May 2018 11:07:47 -0400 Received: from axis700.grange ([87.78.226.14]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LqQnR-1ec2VM39ZB-00e0h5 for ; Tue, 08 May 2018 17:07:45 +0200 Received: from 200r.grange (200r.grange [192.168.1.16]) by axis700.grange (Postfix) with ESMTP id B9BE761809 for ; Tue, 8 May 2018 17:07:44 +0200 (CEST) Received: from lyakh (uid 1000) (envelope-from g.liakhovetski@gmx.de) id 803267 by 200r.grange (DragonFly Mail Agent v0.9); Tue, 08 May 2018 17:07:44 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Guennadi Liakhovetski Subject: [PATCH v8 1/3] uvcvideo: remove a redundant check Date: Tue, 8 May 2018 17:07:42 +0200 Message-Id: <1525792064-30836-2-git-send-email-guennadi.liakhovetski@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1525792064-30836-1-git-send-email-guennadi.liakhovetski@intel.com> References: <1525792064-30836-1-git-send-email-guennadi.liakhovetski@intel.com> X-Provags-ID: V03:K1:TI+pOwkeqnJD9tt1WrOUg5AUfw+cLtn3A4pYRZLtChr3itchoGz Dimm93ygGpyQ4420dAm1Ho5BLnhr/Yvlsln7TlTLOZ5SHyKgfTDpMF6gf6xt6HsQl4jj/Hx bgTMWhG8Tvd+zNxVJi4qanrGtsrTOlydR7q/gZRbH9+V6u3Fl1peL9tO6nxOCYVR2KvrhqF eZxqtU1jphRLerPJQ2itA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3/Ig0PcvsLw=:3ZfFWICf5S3PsFoVEpgM8j Kn85nMeWkzThDtwVBKI/XIjrZl+NoEpTJVcVwdmAqx2LVPsIXwQzIK4ciYwDWQg7oLxzhxXr4 Q+cV85Hh1ZuYjIa2sNPdF0CEKMoW8zoRxhtgf6lFhiM+JUxgwIVEZ0wUATNnQpBy8GSUi4dJR 7u5tvopU85AkyBO3N05eRYYlsycLZO2WuH+xXjFPv3Aqu6OqtNNHA3fZsLJGTgNDXUg/IUSYg lsVrGeal8D8IDuYYEI0Fv0i7NTzbF6XPSQQmhd0i9TwqYiaHvxerIJivEdaCfbwlHx2L78GNf 0mXAvmWD1p2YvZrwabPlC3TjL4J2KoZwQSSMTuy+LuwSG1SGn9AZjohz1xBrbHdUcovcHwPQK ppwLQXPRGVhtetTQW+fEYD7f7X1Jb+9AmHwiS1r4MOpASRGa3gVqOh16QB/oq/qcXCdvf+w6y YRagpy2IQmW7lxLobpHcsdXkEU5feMOeKgr7AsiRbEGIdYcrNVOdK8/3WvrlP6iNB0hjc3qhk tWmsJkJzf8QtVBy8yoee5l6d2ZxgTT59LE0X9/n8fDNFdSRVtty2JPXYBjzk09ClcadcLl07S 2UVthZzPRncs3rCViIgm/OjCGWEKbLN5efTbV7aFZnOKMdcJilz8sxQEAPE4fzzsfgcHzu+R9 KLb6NFvZr9uZ3pgUrw5gLSESS+kZHoPwE3l+uveqF7KRdjd8ZVJERv59srLyt4PCXO6L45XDX qnl0PAnH9CvBl52LZjqwfP4SiMz1K8vC3eX70sufpdY++++P+DsUMiPy5c0= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index a36b4fb..2a213c8 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -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); } }