From: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
To: Jernej Skrabec <jernej.skrabec@gmail.com>, linux-media@vger.kernel.org
Cc: ezequiel@vanguardiasur.com.ar, nicolas.dufresne@collabora.com,
mchehab@kernel.org, robh+dt@kernel.org, mripard@kernel.org,
wens@csie.org, p.zabel@pengutronix.de,
gregkh@linuxfoundation.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev
Subject: Re: [PATCH v2 1/9] media: hantro: Fix probe func error path
Date: Tue, 30 Nov 2021 11:26:02 +0100 [thread overview]
Message-ID: <1ab17bfc-8949-0be6-d4a4-1f17d812ef57@collabora.com> (raw)
In-Reply-To: <20211129182633.480021-2-jernej.skrabec@gmail.com>
Hi Jernej,
W dniu 29.11.2021 o 19:26, Jernej Skrabec pisze:
> If clocks for some reason couldn't be enabled, probe function returns
> immediately, without disabling PM. This obviously leaves PM ref counters
> unbalanced.
>
> Fix that by jumping to appropriate error path, so effects of PM functions
> are reversed.
>
> Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver")
> Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> ---
> drivers/staging/media/hantro/hantro_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index ab2467998d29..3d3107a39dae 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -981,7 +981,7 @@ static int hantro_probe(struct platform_device *pdev)
> ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);
> if (ret) {
> dev_err(&pdev->dev, "Failed to prepare clocks\n");
> - return ret;
> + goto err_pm_disable;
> }
>
> ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
> @@ -1037,6 +1037,7 @@ static int hantro_probe(struct platform_device *pdev)
> v4l2_device_unregister(&vpu->v4l2_dev);
> err_clk_unprepare:
> clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
> +err_pm_disable:
> pm_runtime_dont_use_autosuspend(vpu->dev);
> pm_runtime_disable(vpu->dev);
> return ret;
>
next prev parent reply other threads:[~2021-11-30 10:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-29 18:26 [PATCH v2 0/9] media: hantro: add Allwinner H6 support Jernej Skrabec
2021-11-29 18:26 ` [PATCH v2 1/9] media: hantro: Fix probe func error path Jernej Skrabec
2021-11-30 10:26 ` Andrzej Pietrasiewicz [this message]
2021-11-30 12:11 ` Ezequiel Garcia
2021-11-29 18:26 ` [PATCH v2 2/9] media: hantro: add support for reset lines Jernej Skrabec
2021-11-30 10:42 ` Andrzej Pietrasiewicz
2021-11-30 12:15 ` Ezequiel Garcia
2021-11-29 18:26 ` [PATCH v2 3/9] media: hantro: vp9: use double buffering if needed Jernej Skrabec
2021-11-29 18:26 ` [PATCH v2 4/9] media: hantro: vp9: add support for legacy register set Jernej Skrabec
2021-11-29 18:26 ` [PATCH v2 5/9] media: hantro: move postproc enablement for old cores Jernej Skrabec
2021-11-30 10:44 ` Andrzej Pietrasiewicz
2021-11-30 12:20 ` Ezequiel Garcia
2021-11-29 18:26 ` [PATCH v2 6/9] media: hantro: Convert imx8m_vpu_g2_irq to helper Jernej Skrabec
2021-11-30 10:45 ` Andrzej Pietrasiewicz
2021-11-30 12:20 ` Ezequiel Garcia
2021-11-29 18:26 ` [PATCH v2 7/9] media: dt-bindings: allwinner: document H6 Hantro G2 binding Jernej Skrabec
2021-12-07 21:14 ` Rob Herring
2021-11-29 18:26 ` [PATCH v2 8/9] media: hantro: Add support for Allwinner H6 Jernej Skrabec
2021-11-30 11:08 ` Andrzej Pietrasiewicz
2021-11-30 12:24 ` Ezequiel Garcia
2021-11-29 18:26 ` [PATCH v2 9/9] arm64: dts: allwinner: h6: Add Hantro G2 node Jernej Skrabec
2021-12-16 7:48 ` (subset) " Maxime Ripard
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=1ab17bfc-8949-0be6-d4a4-1f17d812ef57@collabora.com \
--to=andrzej.p@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).