From patchwork Tue May 12 20:39:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 23342 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4CL3IXX024609 for ; Tue, 12 May 2009 21:03:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752439AbZELVCd (ORCPT ); Tue, 12 May 2009 17:02:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752208AbZELVCd (ORCPT ); Tue, 12 May 2009 17:02:33 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:60084 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752189AbZELVCc (ORCPT ); Tue, 12 May 2009 17:02:32 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n4CKwjt9010036 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 12 May 2009 13:59:26 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n4CKwj2I004399; Tue, 12 May 2009 13:58:45 -0700 Message-Id: <200905122058.n4CKwj2I004399@imap1.linux-foundation.org> Subject: [patch 4/4] zoran: fix &&/|| error To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, roel.kluin@gmail.com, hverkuil@xs4all.nl, mchehab@redhat.com From: akpm@linux-foundation.org Date: Tue, 12 May 2009 13:39:29 -0700 X-Spam-Status: No, hits=-3.488 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Roel Kluin Fix &&/|| typo. `default_norm' can be 0 (PAL), 1 (NTSC) or 2 (SECAM), the condition tested was impossible. Signed-off-by: Roel Kluin Cc: Mauro Carvalho Chehab Cc: Hans Verkuil Signed-off-by: Andrew Morton --- drivers/media/video/zoran/zoran_card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/media/video/zoran/zoran_card.c~zoran-fix-error drivers/media/video/zoran/zoran_card.c --- a/drivers/media/video/zoran/zoran_card.c~zoran-fix-error +++ a/drivers/media/video/zoran/zoran_card.c @@ -1022,7 +1022,7 @@ zr36057_init (struct zoran *zr) zr->vbuf_bytesperline = 0; /* Avoid nonsense settings from user for default input/norm */ - if (default_norm < 0 && default_norm > 2) + if (default_norm < 0 || default_norm > 2) default_norm = 0; if (default_norm == 0) { zr->norm = V4L2_STD_PAL;