From patchwork Fri Dec 10 12:39:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 398252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBACdp0c023983 for ; Fri, 10 Dec 2010 12:39:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755969Ab0LJMjs (ORCPT ); Fri, 10 Dec 2010 07:39:48 -0500 Received: from mail-ww0-f42.google.com ([74.125.82.42]:55807 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755762Ab0LJMjr (ORCPT ); Fri, 10 Dec 2010 07:39:47 -0500 Received: by wwi17 with SMTP id 17so913576wwi.1 for ; Fri, 10 Dec 2010 04:39:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=Yc9LODdecvOG8MwLlvJmZFvZWncjfQIqnMzbx9BHhoo=; b=q6eyNDk2BhM4res1iLSjZgK0tMxzfujzirRFZEOXL3/3vuVPTVVYlhVrsKHQvo2TRV fmkq8+vHH1xciuCAcONvG4+KQFMrwP+PJtw0kk+ZrlVF5o3CmvyvCRRyhUwmClCEmz2c p0AsVcFad2Sy03/3paN9SRt8yqc6ki5wJ/Vu8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=RtNyfpvOFW3a8Vp1Q4R4oO1PteXhEcjayca2HLmpsP4qTQY5p8lV85PAwloNJr+S/q CgBB862OabI8AhJdon47ZgimnqVWP9sjG5F2i8Yif0SK/w7Svwf8PDyuhMeLRG2xtqLf +dnJdsQqDyT+dTfpv+9tplcMXlkpEErYgbAoU= Received: by 10.216.156.132 with SMTP id m4mr2056075wek.91.1291984785856; Fri, 10 Dec 2010 04:39:45 -0800 (PST) Received: from bicker (h2d3c.n1.ips.mtn.co.ug [41.210.173.60]) by mx.google.com with ESMTPS id b47sm1446873wer.14.2010.12.10.04.39.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 10 Dec 2010 04:39:45 -0800 (PST) Date: Fri, 10 Dec 2010 15:39:34 +0300 From: Dan Carpenter To: Mauro Carvalho Chehab Cc: mjpeg-users@lists.sourceforge.net, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] [media] zoran: bit-wise vs logical and Message-ID: <20101210123934.GB10623@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Dec 2010 12:39:51 +0000 (UTC) diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c index b02007e..e8a2784 100644 --- a/drivers/media/video/zoran/zoran_device.c +++ b/drivers/media/video/zoran/zoran_device.c @@ -1523,7 +1523,7 @@ zoran_irq (int irq, zr->JPEG_missed > 25 || zr->JPEG_error == 1 || ((zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS) && - (zr->frame_num & (zr->JPEG_missed > zr->jpg_settings.field_per_buff)))) { + (zr->frame_num && (zr->JPEG_missed > zr->jpg_settings.field_per_buff)))) { error_handler(zr, astat, stat); }