From patchwork Fri Nov  5 14:25:40 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Michael Jones <michael.jones@matrix-vision.de>
X-Patchwork-Id: 304122
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 oA5EPm88021098
	for <patchwork-media@patchwork.kernel.org>;
	Fri, 5 Nov 2010 14:25:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752613Ab0KEOZr (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Fri, 5 Nov 2010 10:25:47 -0400
Received: from mail1.matrix-vision.com ([78.47.19.71]:46003 "EHLO
	mail1.matrix-vision.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752546Ab0KEOZq (ORCPT
	<rfc822; linux-media@vger.kernel.org>); Fri, 5 Nov 2010 10:25:46 -0400
Received: from mail1.matrix-vision.com (localhost [127.0.0.1])
	by mail1.matrix-vision.com (Postfix) with ESMTP id 66C6D7245E;
	Fri,  5 Nov 2010 15:25:42 +0100 (CET)
Received: from erinome (g2.matrix-vision.com [80.152.136.245])
	by mail1.matrix-vision.com (Postfix) with ESMTPA id 2991D7230D;
	Fri,  5 Nov 2010 15:25:42 +0100 (CET)
Received: from erinome (localhost [127.0.0.1])
	by erinome (Postfix) with ESMTP id 2E6F76F8A;
	Fri,  5 Nov 2010 15:25:41 +0100 (CET)
Received: by erinome (Postfix, from userid 108)
	id 1FB646F9C; Fri,  5 Nov 2010 15:25:41 +0100 (CET)
Received: from [192.168.65.46] (host65-46.intern.matrix-vision.de
	[192.168.65.46]) by erinome (Postfix) with ESMTPA id 090AE6F8A;
	Fri,  5 Nov 2010 15:25:41 +0100 (CET)
Message-ID: <4CD413E4.20401@matrix-vision.de>
Date: Fri, 05 Nov 2010 15:25:40 +0100
From: Michael Jones <michael.jones@matrix-vision.de>
User-Agent: Thunderbird 2.0.0.24 (X11/20101027)
MIME-Version: 1.0
To: Bastian Hecht <hechtb@googlemail.com>
CC: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>,
	Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: Re: OMAP3530 ISP irqs disabled
References: <AANLkTint8J4NdXQ4v1wmKAKWa7oeSHsdOn8JzjDqCqeY@mail.gmail.com>
	<4CD161B3.9000709@maxwell.research.nokia.com>
	<AANLkTikTAo71Kr+Nh8Q8DOMFwWB=gLQSXozgGo8ecYwm@mail.gmail.com>
	<201011040434.53836.laurent.pinchart@ideasonboard.com>
	<AANLkTik56opb35vrTnsP=U0F+24uvAWxjtnoGnW18Yta@mail.gmail.com>
	<AANLkTi=drc6qQeYx_RHOAuQHZ=h6wy6m9fhHsatAjoQU@mail.gmail.com>
In-Reply-To: <AANLkTi=drc6qQeYx_RHOAuQHZ=h6wy6m9fhHsatAjoQU@mail.gmail.com>
X-MV-Disclaimer: true (erinome)
X-AV-Checked: ClamAV using ClamSMTP (erinome)
X-AV-Checked: ClamAV using ClamSMTP (mail1)
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
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, 05 Nov 2010 14:25:49 +0000 (UTC)


--- a/drivers/media/video/isp/ispccdc.c
+++ b/drivers/media/video/isp/ispccdc.c
@@ -1477,7 +1477,7 @@ static void ispccdc_vd1_isr(struct isp_ccdc_device *ccdc)
        spin_lock_irqsave(&ccdc->lsc.req_lock, flags);

        /* We are about to stop CCDC and/without LSC */
-       if ((ccdc->output & CCDC_OUTPUT_MEMORY) ||
+       if ((ccdc->output & CCDC_OUTPUT_MEMORY) &&
            (ccdc->state == ISP_PIPELINE_STREAM_SINGLESHOT))
                ccdc->stopping = CCDC_STOP_REQUEST;