linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linuxarm@huawei.com, mauro.chehab@huawei.com,
	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Allen Pais <allen.lkml@gmail.com>,
	Chuhong Yuan <hslester96@gmail.com>,
	Ezequiel Garcia <ezequiel@collabora.com>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Helen Koike <helen.koike@collabora.com>,
	Lubomir Rintel <lkundrak@v3.sk>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Vaibhav Gupta <vaibhavgupta40@gmail.com>,
	linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: [PATCH v2 08/79] media: marvel-ccic: fix some issues when getting pm_runtime
Date: Tue, 27 Apr 2021 12:12:35 +0200	[thread overview]
Message-ID: <94d58e3b2323193deaa0f644da8fd0780f513827.1619518193.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1619518193.git.mchehab+huawei@kernel.org>

Calling pm_runtime_get_sync() is bad, since even when it
returns an error, pm_runtime_put*() should be called.
So, use instead pm_runtime_resume_and_get().

While here, ensure that the error condition will be checked
during clock enable an media open() calls.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 drivers/media/platform/marvell-ccic/mcam-core.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 141bf5d97a04..ea87110d9073 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -918,6 +918,7 @@ static int mclk_enable(struct clk_hw *hw)
 	struct mcam_camera *cam = container_of(hw, struct mcam_camera, mclk_hw);
 	int mclk_src;
 	int mclk_div;
+	int ret;
 
 	/*
 	 * Clock the sensor appropriately.  Controller clock should
@@ -931,7 +932,9 @@ static int mclk_enable(struct clk_hw *hw)
 		mclk_div = 2;
 	}
 
-	pm_runtime_get_sync(cam->dev);
+	ret = pm_runtime_resume_and_get(cam->dev);
+	if (ret < 0)
+		return ret;
 	clk_enable(cam->clk[0]);
 	mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div);
 	mcam_ctlr_power_up(cam);
@@ -1611,7 +1614,9 @@ static int mcam_v4l_open(struct file *filp)
 		ret = sensor_call(cam, core, s_power, 1);
 		if (ret)
 			goto out;
-		pm_runtime_get_sync(cam->dev);
+		ret = pm_runtime_resume_and_get(cam->dev);
+		if (ret < 0)
+			goto out;
 		__mcam_cam_reset(cam);
 		mcam_set_config_needed(cam, 1);
 	}
-- 
2.30.2


  parent reply	other threads:[~2021-04-27 10:14 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-27 10:12 [PATCH v2 00/79] Address some issues with PM runtime at media subsystem Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 02/79] media: i2c: ccs-core: return the right error code at suspend Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 03/79] media: i2c: mt9m001: don't resume at remove time Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 04/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 05/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 06/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 07/79] media: atmel: properly get pm_runtime Mauro Carvalho Chehab
2021-04-27 10:12 ` Mauro Carvalho Chehab [this message]
2021-04-27 10:12 ` [PATCH v2 09/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 10/79] media: rcar_fdp1: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 11/79] media: rga-buf: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 12/79] media: renesas-ceu: Properly check for PM errors Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 13/79] media: s5p: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 14/79] media: am437x: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 15/79] media: sh_vou: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 16/79] media: mtk-vcodec: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 17/79] media: s5p-jpeg: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 18/79] media: delta-v4l2: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 19/79] media: sun8i_rotate: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 20/79] staging: media: rkvdec: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 21/79] staging: media: atomisp_fops: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 22/79] staging: media: imx7-mipi-csis: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 23/79] staging: media: ipu3: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 24/79] staging: media: cedrus_video: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 25/79] staging: media: vde: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 26/79] staging: media: csi: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 27/79] staging: media: vi: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 28/79] media: i2c: ak7375: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 29/79] media: i2c: ccs-core: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 30/79] media: i2c: dw9714: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 31/79] media: i2c: dw9768: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 32/79] media: i2c: dw9807-vcm: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 33/79] media: i2c: hi556: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 34/79] media: i2c: imx214: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 35/79] media: i2c: imx219: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 36/79] media: i2c: imx258: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 37/79] media: i2c: imx274: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 38/79] media: i2c: imx290: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 39/79] media: i2c: imx319: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 40/79] media: i2c: imx334: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 41/79] media: i2c: imx355: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 42/79] media: i2c: mt9m001: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 43/79] media: i2c: ov02a10: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 44/79] media: i2c: ov13858: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 45/79] media: i2c: ov2659: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 46/79] media: i2c: ov2685: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 47/79] media: i2c: ov2740: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 48/79] media: i2c: ov5647: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 49/79] media: i2c: ov5648: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 50/79] media: i2c: ov5670: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 51/79] media: i2c: ov5675: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 52/79] media: i2c: ov5695: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 53/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 54/79] media: i2c: ov8856: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 55/79] media: i2c: ov8865: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 56/79] media: i2c: ov9734: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 57/79] media: i2c: tvp5150: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 58/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 59/79] media: sti/hva: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 60/79] media: ipu3: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 61/79] media: coda: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 62/79] media: exynos4-is: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 63/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 64/79] media: mtk-jpeg: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 65/79] media: camss: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 66/79] media: venus: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 67/79] media: venus: vdec: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 68/79] media: venus: venc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 69/79] media: rcar-fcp: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 70/79] media: rkisp1: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 71/79] media: s3c-camif: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 72/79] media: s5p-mfc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 73/79] media: bdisp-v4l2: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 74/79] media: stm32: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 75/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 76/79] media: ti-vpe: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 77/79] media: vsp1: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 78/79] media: rcar-vin: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 79/79] media: hantro: document the usage of pm_runtime_get_sync() Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=94d58e3b2323193deaa0f644da8fd0780f513827.1619518193.git.mchehab+huawei@kernel.org \
    --to=mchehab+huawei@kernel.org \
    --cc=allen.lkml@gmail.com \
    --cc=ezequiel@collabora.com \
    --cc=gustavoars@kernel.org \
    --cc=helen.koike@collabora.com \
    --cc=hslester96@gmail.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=lkundrak@v3.sk \
    --cc=mauro.chehab@huawei.com \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=vaibhavgupta40@gmail.com \
    --subject='Re: [PATCH v2 08/79] media: marvel-ccic: fix some issues when getting pm_runtime' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).