From patchwork Thu Jan 23 10:28:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 21694 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1W6HWc-0006V5-WA; Thu, 23 Jan 2014 11:28:43 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1W6HWb-00067l-jT; Thu, 23 Jan 2014 11:28:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753022AbaAWK2f (ORCPT + 1 other); Thu, 23 Jan 2014 05:28:35 -0500 Received: from smtp-out003.kontent.com ([81.88.40.217]:33420 "EHLO smtp-out003.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752880AbaAWK2d (ORCPT ); Thu, 23 Jan 2014 05:28:33 -0500 Received: from linux-fkkt.site (p50894C18.dip0.t-ipconnect.de [80.137.76.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: neukum_org@smtp-out003.kontent.com) by smtp-out003.kontent.com (Postfix) with ESMTPSA id E9DD840009C1; Thu, 23 Jan 2014 11:28:32 +0100 (CET) From: oliver@neukum.org To: laurent.pinchart@ideasonboard.com, linux-media@vger.kernel.org Cc: Oliver Neukum Subject: [PATCH] uvc: simplify redundant check Date: Thu, 23 Jan 2014 11:28:25 +0100 Message-Id: <1390472905-29586-2-git-send-email-oliver@neukum.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1390472905-29586-1-git-send-email-oliver@neukum.org> References: <1390472905-29586-1-git-send-email-oliver@neukum.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.1.23.101515 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_REAL_NAME 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Oliver Neukum x < constant implies x + unsigned < constant That check just obfuscates the code Signed-off-by: Oliver Neukum --- drivers/media/usb/uvc/uvc_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index c3bb250..b6cac17 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -925,7 +925,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev, case UVC_VC_HEADER: n = buflen >= 12 ? buffer[11] : 0; - if (buflen < 12 || buflen < 12 + n) { + if (buflen < 12 + n) { uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " "interface %d HEADER error\n", udev->devnum, alts->desc.bInterfaceNumber);