From patchwork Sat May 2 21:32:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Kluin X-Patchwork-Id: 21590 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 n42LWgFI020861 for ; Sat, 2 May 2009 21:32:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756075AbZEBVcK (ORCPT ); Sat, 2 May 2009 17:32:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758309AbZEBVcK (ORCPT ); Sat, 2 May 2009 17:32:10 -0400 Received: from mail-ew0-f224.google.com ([209.85.219.224]:47400 "EHLO mail-ew0-f224.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756075AbZEBVcI (ORCPT ); Sat, 2 May 2009 17:32:08 -0400 Received: by ewy24 with SMTP id 24so3016749ewy.37 for ; Sat, 02 May 2009 14:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=JW2e8MRu22odbYvBkyGoT9JslgM4CKE0I3dACxNZBPs=; b=hzVc+8D6JqcdHDD8a4yBF8A69ffwiPBCGs6b+RIcxR9BWyXlOQEba8VaJcB04ThRve V6xZlmgyUV+uhVdalBUk4HNhdi+7kYwhowQ5V+1IkdrzimsNJPOmQ+eaMYUcKRpA9bID jZ+9o+iwCnwKVgRtY8isPhEEYge4sDPUQa2Uo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=cTpii3q+O7DtJ7yvbYXR65gs7MDoNqdRIBkyDG9aHQGbBc3HI8ARMby0lYLv4MhN8h hiU148Vm8QuvzHeVsfAMY4HyfCugiyjtwHtIIeGz+T0aPeFhxxnj6EBlCzcR5JOve9Nd 84yniIQyZZCe6SpaXmssVZzwRzhnWEPRU97Xs= Received: by 10.210.56.7 with SMTP id e7mr4392943eba.19.1241299928086; Sat, 02 May 2009 14:32:08 -0700 (PDT) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 5sm4010794eyh.30.2009.05.02.14.32.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 02 May 2009 14:32:07 -0700 (PDT) Message-ID: <49FCBBD8.4030804@gmail.com> Date: Sat, 02 May 2009 23:32:08 +0200 From: Roel Kluin User-Agent: Thunderbird 2.0.0.21 (X11/20090302) MIME-Version: 1.0 To: hverkuil@xs4all.nl CC: linux-media@vger.kernel.org, mjpeg-users@lists.sourceforge.net, Andrew Morton , klimov.linux@gmail.com Subject: [PATCH] zoran: Fix &&/|| typo Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fix &&/|| typo. `default_norm' can be 0 (PAL), 1 (NTSC) or 2 (SECAM), the condition tested was impossible. Signed-off-by: Roel Kluin --- -- 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/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c index ea6c577..ea9de8b 100644 --- a/drivers/media/video/zoran/zoran_card.c +++ b/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;