From patchwork Tue Apr 23 10:51:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuya MATSUBARA X-Patchwork-Id: 18154 X-Patchwork-Delegate: g.liakhovetski@gmx.de Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UUapv-0004SY-7h; Tue, 23 Apr 2013 12:52:35 +0200 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-3) with esmtp id 1UUapu-0002Xw-En; Tue, 23 Apr 2013 12:52:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756141Ab3DWKwc (ORCPT + 1 other); Tue, 23 Apr 2013 06:52:32 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:52404 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751669Ab3DWKwb (ORCPT ); Tue, 23 Apr 2013 06:52:31 -0400 Received: by mail-pd0-f169.google.com with SMTP id 10so362221pdc.28 for ; Tue, 23 Apr 2013 03:52:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=4hD2rE8Rt2u5Iz6RgoHp/t3el6CCbKkNOYgSrODNSEY=; b=WV3T5xK3IUVE2v41G3BaQeMCOvC+krkdqdxDiEyF8A0JyvPoSq7rly7NkMNT2AW3Gz wWyQ/qbJzxk/yivvyua/bdTOQkdWeHd7vUYjKMdwBKgf9WRSbbmf22CeDN4S3yCAYsqg 3FG+6WVlYlILy3amPNjAD3IjridsFNJkF6pGiW8UvJ3oadFVSDqtl8Pvwhsl1A02Y+tw lWwUzRS6V6EYiB2HjfKlKWoEXbl9Ckp4KbE2TFWSxULVXxeC1rM6XDvCtnjxucIdK7SV ix+mPYpEBmdpfEYBXNVNnReKh72iYkGhP1fiLGtNJRgdQEizWEXmDTG4jFu8FAtQVyJQ AQBA== X-Received: by 10.68.185.4 with SMTP id ey4mr23382230pbc.40.1366714351411; Tue, 23 Apr 2013 03:52:31 -0700 (PDT) Received: from localhost.localdomain ([219.106.231.132]) by mx.google.com with ESMTPS id ih1sm26463098pbb.44.2013.04.23.03.52.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 23 Apr 2013 03:52:30 -0700 (PDT) From: Katsuya Matsubara To: Guennadi Liakhovetski Cc: Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-sh@vger.kernel.org, Katsuya Matsubara Subject: [PATCH 1/3] [media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted Date: Tue, 23 Apr 2013 19:51:35 +0900 Message-Id: <1366714297-2784-2-git-send-email-matsu@igel.co.jp> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1366714297-2784-1-git-send-email-matsu@igel.co.jp> References: <1366714297-2784-1-git-send-email-matsu@igel.co.jp> X-Gm-Message-State: ALoCoQlgApAQUezvuOPiMn0gnUu3i0VDyktdqNJMDHjGSGCdNZbfnFUKHzOGnnt8Z7H6Jymj18ep 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: 2013.4.23.104216 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' v4l2_m2m_job_finish() should be invoked even if the current ongoing job has been aborted since v4l2_m2m_ctx_release() which has issued the job abort may wait until the finish function is invoked. Signed-off-by: Katsuya Matsubara --- drivers/media/platform/sh_veu.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index cb54c69..f88c0e8 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -1137,10 +1137,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id) veu->xaction++; - if (!veu->aborting) - return IRQ_WAKE_THREAD; - - return IRQ_HANDLED; + return IRQ_WAKE_THREAD; } static int sh_veu_probe(struct platform_device *pdev)