From nobody Sat May 10 05:59:25 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619519694; cv=none; d=zohomail.com; s=zohoarc; b=l5q++eKIIL2iY1pKp0Mqw5zgtYWXymJMrXvr0hFErouPosWXUFFGzSkb6AMysXoGIuax3GEo3mdK+X12P5L0cjs1vK4qXrYnVeDmBsEH3AEc2JiUZQeMWyTt6FopkqkwngXk6UzjagHvMOj360pojB66Q3+p4dzG2g3Uppxc1wM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519694; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L9GUzAChTMJUtDH0+OWuOob2OsTvBtiUXD5nsFmfEUo=; b=TD1rL5xUjEMSn9d5vPkluNw34SzCBfVNXBfM4qgP8pd9/E2wS1qTHWj+tFjUItl5LxAaYBXbEitmOBVVQ2Oz5bz86nn6Cly9dJ82HZ8qXCSyE9eB5n9+GVOeV1HMHJcPGledQru8OCG+Y20NJtXNm+AfKYLoEuWOTFnGtvRiA5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619519694964968.0174043822867; Tue, 27 Apr 2021 03:34:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238828AbhD0KeQ (ORCPT ); Tue, 27 Apr 2021 06:34:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238099AbhD0K2m (ORCPT ); Tue, 27 Apr 2021 06:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0383361481; Tue, 27 Apr 2021 10:27:17 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzt-JM; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=v3oOn6uPHJX4lDQc2LG+Rn/44BbALYGNkVgzHn1PdbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEckz/fuxi4Yvs858mBbDa/aqLRqDtn9bj58CCmGAwK+QlqI37NtGR/Y+J/OXjsBP PNc65TsKhuzdT/yReKJQSOyQBpdMzZ3HgVk459MlonuhUKxN06+tIgvNT9Jaz3QfE/ trGOaUWCkBkAAj8suBC9dpgUQjA3PnqAsf9lWiAqueppxgWDLid18DETKQP8NS5sUJ vX1DuVJFZrSRH+Pnwv+Ne0PkrDqGtAXPQHQRPQtlzPUbAiiFx4ilBStNbtSSQrgyhW /Sio56g1+Bv5UGnVUQL38bXFwNA+Ws2vC8338NGikS7/6p8sHMdeRjAOuJjko4MMG1 pbDKV4IBvXrOg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Lad, Prabhakar" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 14/79] media: am437x: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:04 +0200 Message-Id: <657bba55e6afbb321b0f0c612d0b8f900e365594.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. While here, ensure that the driver will check if PM runtime resumed at vpfe_initialize_device(). Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/am437x/am437x-vpfe.c | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/pl= atform/am437x/am437x-vpfe.c index 6cdc77dda0e4..bced526f30f2 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1021,7 +1021,9 @@ static int vpfe_initialize_device(struct vpfe_device = *vpfe) if (ret) return ret; =20 - pm_runtime_get_sync(vpfe->pdev); + ret =3D pm_runtime_resume_and_get(vpfe->pdev); + if (ret < 0) + return ret; =20 vpfe_config_enable(&vpfe->ccdc, 1); =20 @@ -2443,7 +2445,11 @@ static int vpfe_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); =20 /* for now just enable it here instead of waiting for the open */ - pm_runtime_get_sync(&pdev->dev); + ret =3D pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) { + vpfe_err(vpfe, "Unable to resume device.\n"); + goto probe_out_v4l2_unregister; + } =20 vpfe_ccdc_config_defaults(ccdc); =20 @@ -2527,10 +2533,11 @@ static int vpfe_suspend(struct device *dev) { struct vpfe_device *vpfe =3D dev_get_drvdata(dev); struct vpfe_ccdc *ccdc =3D &vpfe->ccdc; + int ret; =20 /* only do full suspend if streaming has started */ if (vb2_start_streaming_called(&vpfe->buffer_queue)) { - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); vpfe_config_enable(ccdc, 1); =20 /* Save VPFE context */ @@ -2541,7 +2548,8 @@ static int vpfe_suspend(struct device *dev) vpfe_config_enable(ccdc, 0); =20 /* Disable both master and slave clock */ - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); } =20 /* Select sleep pin state */ @@ -2583,18 +2591,20 @@ static int vpfe_resume(struct device *dev) { struct vpfe_device *vpfe =3D dev_get_drvdata(dev); struct vpfe_ccdc *ccdc =3D &vpfe->ccdc; + int ret; =20 /* only do full resume if streaming has started */ if (vb2_start_streaming_called(&vpfe->buffer_queue)) { /* Enable both master and slave clock */ - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); vpfe_config_enable(ccdc, 1); =20 /* Restore VPFE context */ vpfe_restore_context(ccdc); =20 vpfe_config_enable(ccdc, 0); - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); } =20 /* Select default pin state */ --=20 2.30.2