From patchwork Tue Oct 30 13:49:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15294 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TTCCH-0004H6-4w for patchwork@linuxtv.org; Tue, 30 Oct 2012 14:49:37 +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.75/mailfrontend-2) with esmtp for id 1TTCCG-00046A-HR; Tue, 30 Oct 2012 14:49:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282Ab2J3Nte (ORCPT ); Tue, 30 Oct 2012 09:49:34 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:65351 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004Ab2J3Ntd (ORCPT ); Tue, 30 Oct 2012 09:49:33 -0400 Received: by mail-qa0-f46.google.com with SMTP id c26so2162382qad.19 for ; Tue, 30 Oct 2012 06:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=+dQF5AhFDXR9H9GwVns19qm6XcdyMcMMMoR0kBwnMXw=; b=U52On/RBwbMmkBiTC3j7c5oOx9m1L0GkNoFJfnShSIIfT2HVmuA+MhPQHuWDiZsKSA aYeMylK7rDvvbzTG95+psrQpcCwva3tMtsTtuCnR7NYTDxkkergoEJg5E/az06NIXw7q /AHWwifEWHf99Zaczgmg0q/vwM26ygFswyZE3p+JYVaZSwCvVHRKm+J29NvdUjQ8uBop ovIq/hsPH8rq21QxucqtWNSm/jPMsj83A5UjZX6l3wfhKoBx5Soa3zjq56FhvnfDxBMR IBfK1JVGq/aslBZAiHPvS7NstjM0By9p907H0i9+b1ZqeCEA3Ti+INoaVmInjW0I3TxW mR5g== MIME-Version: 1.0 Received: by 10.49.60.231 with SMTP id k7mr25620169qer.25.1351604973005; Tue, 30 Oct 2012 06:49:33 -0700 (PDT) Received: by 10.229.207.197 with HTTP; Tue, 30 Oct 2012 06:49:32 -0700 (PDT) Date: Tue, 30 Oct 2012 21:49:32 +0800 Message-ID: Subject: [PATCH] [media] vpif_capture: fix condition logic in vpif_capture.c From: Wei Yongjun To: mchehab@infradead.org, prabhakar.lad@ti.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.30.133923 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Wei Yongjun The pattern E == C1 && E == C2 is always false. This patch fix this according to the assumption that && should be ||. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun --- drivers/media/platform/davinci/vpif_capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index fcabc02..2d28a96 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1715,7 +1715,7 @@ vpif_enum_dv_timings(struct file *file, void *priv, int ret; ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings); - if (ret == -ENOIOCTLCMD && ret == -ENODEV) + if (ret == -ENOIOCTLCMD || ret == -ENODEV) return -EINVAL; return ret; } @@ -1735,7 +1735,7 @@ vpif_query_dv_timings(struct file *file, void *priv, int ret; ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings); - if (ret == -ENOIOCTLCMD && ret == -ENODEV) + if (ret == -ENOIOCTLCMD || ret == -ENODEV) return -ENODATA; return ret; }