From patchwork Tue Apr 23 10:51:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuya MATSUBARA X-Patchwork-Id: 18155 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 1UUapy-0004Sw-DK; Tue, 23 Apr 2013 12:52:38 +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 1UUapx-0002Xw-Ef; Tue, 23 Apr 2013 12:52:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755506Ab3DWKwg (ORCPT + 1 other); Tue, 23 Apr 2013 06:52:36 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:55982 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754777Ab3DWKwf (ORCPT ); Tue, 23 Apr 2013 06:52:35 -0400 Received: by mail-pd0-f174.google.com with SMTP id y14so358293pdi.33 for ; Tue, 23 Apr 2013 03:52:34 -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=7ZazGI2zZVTxFvGu0/b9DN/+XHbKGDBkMqDRuhBZUD8=; b=hCRQvl88UUO9QZo671VVKYoqa4MA1kHBleb15dicYFygwEv8zB9rm19tjHWqyPRQUv 3r1heTxFIMQ1qgP62yhAE1/FQbS2/XG86PUlJVDplr6Gfx+coF/a7cHhuwJzdq0qF7K2 jcwH6rq69ji5xj9zSxyay2OAec2ewudvwbopAlpzOSoHKmjwg5aGbgfHP9myPO8q7gqS pNx6hwMu56EWUscLlKKKnTTR3TQuZjDf8lKr9+1k8OcxpAqdyh1dlSfadXiIGaTUK1Ri DbGfDy2jdspzYgoIyDObjNrxkkcUof1G6hfmy09ilz5Z6jLADk7SsJ3DmzRnBVJ/wJHi 3yZQ== X-Received: by 10.68.254.167 with SMTP id aj7mr39209484pbd.98.1366714354567; Tue, 23 Apr 2013 03:52:34 -0700 (PDT) Received: from localhost.localdomain ([219.106.231.132]) by mx.google.com with ESMTPS id ih1sm26463098pbb.44.2013.04.23.03.52.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 23 Apr 2013 03:52:33 -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 2/3] [media] sh_veu: keep power supply until the m2m context is released Date: Tue, 23 Apr 2013 19:51:36 +0900 Message-Id: <1366714297-2784-3-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: ALoCoQmJ3otJdcBgiVxKUXTaqC21EnD7S36wayjeefrFQwMJYpUX9HGrWOQU6L7zDBpbo82IuFcc 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_1200_1299 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' In the sh_veu driver, only the interrupt handler 'sh_veu_bh' can invoke the v4l2_m2m_job_finish() function. So the hardware must be alive for handling interrupts until returning from v4l2_m2m_ctx_release(). Signed-off-by: Katsuya Matsubara --- drivers/media/platform/sh_veu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index f88c0e8..fa86c6f 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -1032,8 +1032,6 @@ static int sh_veu_release(struct file *file) dev_dbg(veu->dev, "Releasing instance %p\n", veu_file); - pm_runtime_put(veu->dev); - if (veu_file == veu->capture) { veu->capture = NULL; vb2_queue_release(v4l2_m2m_get_vq(veu->m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)); @@ -1049,6 +1047,8 @@ static int sh_veu_release(struct file *file) veu->m2m_ctx = NULL; } + pm_runtime_put(veu->dev); + kfree(veu_file); return 0;