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: 2477001 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C2C79DFE75 for ; Tue, 23 Apr 2013 10:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756146Ab3DWKwc (ORCPT ); Tue, 23 Apr 2013 06:52:32 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:36214 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754777Ab3DWKwb (ORCPT ); Tue, 23 Apr 2013 06:52:31 -0400 Received: by mail-pb0-f50.google.com with SMTP id um15so131344pbc.37 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=KOKu5CgDSvOcCQGREGFOjrodg7f5c1FRf2l1miEy1BMFbpqBzjr+v03uBDUXnBFJ4T 0BKf/cQ1Jkbfav0SJbuFLh1hEGl5xjEzKoeF0kH6JVgrYMFYbXTGZDUCnd3R7BiaidYx MR35lOdp9lqTGGsIuB4UHKiKHzr4102SVzZY6ndA3engZGTYu89dCAe61XXB9DaZeBFO LRHv2kwn2qD8k6IVV0arMXXnkNNRAfoY3zxJ/aldCnpDAPove4KKj8bMcQVN3U0EtNsB 9aBc7Xk3+Br4cbtVzooiIgkR4nuYtsfue1UWafXcoKukP4YPj8jGdYawqzIcwlLfrR7P QciQ== 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: ALoCoQnEzWeIQ2D7FHmhnJyOmmYSl3k33IEwIy7qlpo2gga9oB03OTw2z9v/Ag5Rbk8XcvfmM9e6 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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)