From patchwork Mon Feb 13 13:51:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 9866 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RwwKI-0000pV-Ri for patchwork@linuxtv.org; Mon, 13 Feb 2012 14:52:18 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1RwwKI-00043D-AG; Mon, 13 Feb 2012 14:52:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756628Ab2BMNwP (ORCPT ); Mon, 13 Feb 2012 08:52:15 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:43155 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756567Ab2BMNwN (ORCPT ); Mon, 13 Feb 2012 08:52:13 -0500 Received: by mail-we0-f174.google.com with SMTP id b13so3480160wer.19 for ; Mon, 13 Feb 2012 05:52:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.135.138 with SMTP id u10mr4659643wei.43.1329141132548; Mon, 13 Feb 2012 05:52:12 -0800 (PST) Received: from localhost.localdomain (182.50.18.95.dynamic.jazztel.es. [95.18.50.182]) by mx.google.com with ESMTPS id eq5sm46989029wib.2.2012.02.13.05.52.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 05:52:11 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, mchehab@infradead.org, s.hauer@pengutronix.de, Javier Martin Subject: [PATCH 4/6] media: i.MX27 camera: return IRQ_NONE if no IRQ status bit is set. Date: Mon, 13 Feb 2012 14:51:53 +0100 Message-Id: <1329141115-23133-5-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> References: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQmI2hTra3qPPHminaUtvwa30OeXugqKvyPvcGqOoaKUQOGSj4FSBnillty3STL6Regx3nN0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.2.13.134523 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' If active_bufs() list is empty and no IRQ status bit is set we are probably dealing with a share IRQ. Return IRQ_NONE in this case. Signed-off-by: Javier Martin --- drivers/media/video/mx2_camera.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 34b43a4..d9028f1 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1302,7 +1302,11 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) if (list_empty(&pcdev->active_bufs)) { dev_warn(pcdev->dev, "%s: called while active list is empty\n", __func__); - goto irq_ok; + + if (!status) { + spin_unlock(&pcdev->lock); + return IRQ_NONE; + } } if (status & (1 << 7)) { /* overflow */ @@ -1327,7 +1331,6 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) mx27_camera_frame_done_emma(pcdev, 1, false); } -irq_ok: spin_unlock(&pcdev->lock); writel(status, pcdev->base_emma + PRP_INTRSTATUS);