From patchwork Sat May 2 20:52:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Kluin X-Patchwork-Id: 21588 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 n42KqwTF018143 for ; Sat, 2 May 2009 20:52:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759312AbZEBUwy (ORCPT ); Sat, 2 May 2009 16:52:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758588AbZEBUwy (ORCPT ); Sat, 2 May 2009 16:52:54 -0400 Received: from mail-ew0-f224.google.com ([209.85.219.224]:44684 "EHLO mail-ew0-f224.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759565AbZEBUwx (ORCPT ); Sat, 2 May 2009 16:52:53 -0400 Received: by ewy24 with SMTP id 24so3004844ewy.37 for ; Sat, 02 May 2009 13:52:52 -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=qyxeP068aoDDgmHDhnkJZE+Wz0w6niSjgwj5uQrY+dg=; b=aD9Xb5CIcO76xk7eErCgqImD+Icz1bQJHn2rkuKlQwUmAY5NS7ZqIMWSQgqOZgurP7 cvJMHgnlJKuIoc1/MSCagbSlCLt11aavYDgUkWpvqpi3UXpFeLKZQETDO0Ix4fGLMYnR WOKD6FeXVK1yJtd6Feej1Kl5NaVNl5yR0jk/0= 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=fV0O1aZ6pz2tGm3FUBJJ0tYyiEIgXjTanPoU2j7P0v/Me9uwPCzUCn36zPdGlZLBcd LUFUBLm08T5Vt+mLGtjqac15DxqZoybHdgbZbg+aI8345y+t4zMZx1rbg/JTbI7vRO72 TcyYzNFSk81ElNHpNrDib1WMkZ/EeRdHneDMs= Received: by 10.210.13.9 with SMTP id 9mr2944926ebm.43.1241297572331; Sat, 02 May 2009 13:52:52 -0700 (PDT) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 7sm8161070eyg.47.2009.05.02.13.52.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 02 May 2009 13:52:51 -0700 (PDT) Message-ID: <49FCB2A4.2000609@gmail.com> Date: Sat, 02 May 2009 22:52:52 +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 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 --- 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;