From patchwork Tue Apr 27 10:26:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12226083 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0383C433B4 for ; Tue, 27 Apr 2021 10:30:25 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64358611C1 for ; Tue, 27 Apr 2021 10:30:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64358611C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6YwpU7rTm/c+dRsUkUmQN/VbVXtO8UAqp7ITLugo4b8=; b=buzRu8v01EF40aFYV/mdTGDG1 GWwgBUNoamIOLvzGBcAT2CqXCeiOJVyRlWY9dZzJPpq9vlK26tJ2nrh5HjtqpYz1S1PAJM+ATxjlG 7vAiqlxh0j3JLg4fRBcCkOs42wG1RJlEmCaEhJgmLOHbkWZnIudrtrXtM23ujtfcngENrTjfjG/w3 xwXWtPgl2M2wSEmSoqxktUK2mOvbqRwIX2FXy/+1dsHvqLZmn6YxaLsw7xqjmLM1OLskqrwv3HtD1 GJJfzjVOByXcRojmMjM79+qTpfbLnHx5aJ1kJJznHPnemkuqkskyr8pGPGMtCedUVHL7zf0XKO6is 4lZMh4FJA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbKwB-001Mz1-Si; Tue, 27 Apr 2021 10:27:29 +0000 Received: from bombadil.infradead.org ([198.137.202.133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKw6-001MyH-Fs for linux-arm-kernel@desiato.infradead.org; Tue, 27 Apr 2021 10:27:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=jRs3kCxj+As+g9pcmhKqvb7XbS7lWnL6DNo95j2Z3/k=; b=20ptcRN1qoWYZo6442rTP2uVZM pWqokKqspSmX/s9gEqI94pq6FDVNdZ9DkoYe6ZsG3xDbGL/SaUqaRfLC7u1WezQQZ5NOn6My2C1WE HtNrAaIBc9CJKmci+pjCHLM9iEJkUwQCv3r1WRRrv7yfmiChFUzZ5z9+jTdWVBg4XYWr2nqAHWS7M CC69RpPJJCTsbQsAn6Jkum09Zl5KNdjsBmZPlbvjoIS23TYlkEI7pMcGNZ7sEbhMcDZTCRXarhvxp f0CHNdX/qCFwxTbyFYRVE41F3gwLja3deo3fUEgTor2a80vX5qnJq4DwSsMfAx8gqixClWffZfXKp 8FXV5M/A==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKw2-00Gd7f-Hd for linux-arm-kernel@lists.infradead.org; Tue, 27 Apr 2021 10:27:21 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E9EB6613B0; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=cJmIogEt8DtaRrLuirE0smJSOENxo/aAnd7cgWYfYDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=an5zXV4X4Z3N7pCHC/a/6eYE7scIqU4vlkIl+I7UH2FlGFBDBxKWTw6XmhfMDOITS VHft04reu6+NJE9JmenhS5NxnuekX3RtZ0ipRFGENclmNwHrveYuRGAo9cES6dQH9S YF87XkXE25CYGMNoRznmrPZ5amfrFy6Qk3y8Q1ulo82EJgWa33cVg2d9IuE5Aci9e4 NJgU+orRAJb4ucqo86+R7URiJqIE9D25KyNAsmM7t7b8LZRpKbUt8w+ue7pu2lBBN8 FdFl6ZnFLoOO+DWqn2dLwfKiZloqt1IyvR7K/XTcrOvcT8fzRaITg30hlt7aDtcqqU FYpkEtiYCZkHw== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000o02-PS; Tue, 27 Apr 2021 12:27:11 +0200 From: Mauro Carvalho Chehab To: Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrzej Pietrasiewicz , Jacek Anaszewski , Mauro Carvalho Chehab , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 17/79] media: s5p-jpeg: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:07 +0200 Message-Id: <7ef9d9ec7810a6d2ff53ba8685fcc91a952bbbb5.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210427_032718_649945_E20D71F6 X-CRM114-Status: GOOD ( 11.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter and avoid memory leaks. Reviewed-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab Acked-by: Andrzej Pietrasiewicz --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 026111505f5a..c4f19418a460 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -2568,7 +2568,7 @@ static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(q); int ret; - ret = pm_runtime_get_sync(ctx->jpeg->dev); + ret = pm_runtime_resume_and_get(ctx->jpeg->dev); return ret > 0 ? 0 : ret; }