* [PATCH 2/2] media: camif-core: Add check for clk_enable()
@ 2024-11-21 21:05 Jiasheng Jiang
2024-11-21 21:05 ` [PATCH 1/2] media: mipi-csis: " Jiasheng Jiang
0 siblings, 1 reply; 4+ messages in thread
From: Jiasheng Jiang @ 2024-11-21 21:05 UTC (permalink / raw)
To: sylvester.nawrocki, mchehab, dron0gus, tomasz.figa, krzk,
alim.akhtar, kyungmin.park, laurent.pinchart
Cc: linux-media, linux-arm-kernel, linux-samsung-soc, linux-kernel,
Jiasheng Jiang
Add check for the return value of clk_enable() to gurantee the success.
Fixes: babde1c243b2 ("[media] V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
.../media/platform/samsung/s3c-camif/camif-core.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/samsung/s3c-camif/camif-core.c b/drivers/media/platform/samsung/s3c-camif/camif-core.c
index de6e8f151849..221e3c447f36 100644
--- a/drivers/media/platform/samsung/s3c-camif/camif-core.c
+++ b/drivers/media/platform/samsung/s3c-camif/camif-core.c
@@ -527,10 +527,19 @@ static void s3c_camif_remove(struct platform_device *pdev)
static int s3c_camif_runtime_resume(struct device *dev)
{
struct camif_dev *camif = dev_get_drvdata(dev);
+ int ret;
+
+ ret = clk_enable(camif->clock[CLK_GATE]);
+ if (ret)
+ return ret;
- clk_enable(camif->clock[CLK_GATE]);
/* null op on s3c244x */
- clk_enable(camif->clock[CLK_CAM]);
+ ret = clk_enable(camif->clock[CLK_CAM]);
+ if (ret) {
+ clk_disable(camif->clock[CLK_GATE]);
+ return ret;
+ }
+
return 0;
}
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] media: mipi-csis: Add check for clk_enable()
2024-11-21 21:05 [PATCH 2/2] media: camif-core: Add check for clk_enable() Jiasheng Jiang
@ 2024-11-21 21:05 ` Jiasheng Jiang
2024-11-22 7:01 ` Krzysztof Kozlowski
0 siblings, 1 reply; 4+ messages in thread
From: Jiasheng Jiang @ 2024-11-21 21:05 UTC (permalink / raw)
To: sylvester.nawrocki, mchehab, dron0gus, tomasz.figa, krzk,
alim.akhtar, kyungmin.park, laurent.pinchart
Cc: linux-media, linux-arm-kernel, linux-samsung-soc, linux-kernel,
Jiasheng Jiang
Add check for the return value of clk_enable() to gurantee the success.
Fixes: b5f1220d587d ("[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
drivers/media/platform/samsung/exynos4-is/mipi-csis.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
index 63f3eecdd7e6..d1c938065475 100644
--- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
@@ -940,7 +940,9 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime)
state->supplies);
goto unlock;
}
- clk_enable(state->clock[CSIS_CLK_GATE]);
+ ret = clk_enable(state->clock[CSIS_CLK_GATE]);
+ if (ret)
+ goto unlock;
}
if (state->flags & ST_STREAMING)
s5pcsis_start_stream(state);
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] media: mipi-csis: Add check for clk_enable()
2024-11-21 21:05 ` [PATCH 1/2] media: mipi-csis: " Jiasheng Jiang
@ 2024-11-22 7:01 ` Krzysztof Kozlowski
2024-11-22 19:47 ` Jiasheng Jiang
0 siblings, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2024-11-22 7:01 UTC (permalink / raw)
To: Jiasheng Jiang, sylvester.nawrocki, mchehab, dron0gus,
tomasz.figa, alim.akhtar, kyungmin.park, laurent.pinchart
Cc: linux-media, linux-arm-kernel, linux-samsung-soc, linux-kernel
On 21/11/2024 22:05, Jiasheng Jiang wrote:
> Add check for the return value of clk_enable() to gurantee the success.
>
> Fixes: b5f1220d587d ("[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers")
> Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
> ---
> drivers/media/platform/samsung/exynos4-is/mipi-csis.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> index 63f3eecdd7e6..d1c938065475 100644
> --- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> +++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> @@ -940,7 +940,9 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime)
> state->supplies);
> goto unlock;
> }
> - clk_enable(state->clock[CSIS_CLK_GATE]);
> + ret = clk_enable(state->clock[CSIS_CLK_GATE]);
> + if (ret)
> + goto unlock;
You should unwind the work done, so power off the phy and disble regulators.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] media: mipi-csis: Add check for clk_enable()
2024-11-22 7:01 ` Krzysztof Kozlowski
@ 2024-11-22 19:47 ` Jiasheng Jiang
0 siblings, 0 replies; 4+ messages in thread
From: Jiasheng Jiang @ 2024-11-22 19:47 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: sylvester.nawrocki, mchehab, dron0gus, tomasz.figa, alim.akhtar,
kyungmin.park, laurent.pinchart, linux-media, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Hi Krzysztof,
On Fri, Nov 22, 2024 at 2:01 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On 21/11/2024 22:05, Jiasheng Jiang wrote:
> > Add check for the return value of clk_enable() to gurantee the success.
> >
> > Fixes: b5f1220d587d ("[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers")
> > Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
> > ---
> > drivers/media/platform/samsung/exynos4-is/mipi-csis.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> > index 63f3eecdd7e6..d1c938065475 100644
> > --- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> > +++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
> > @@ -940,7 +940,9 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime)
> > state->supplies);
> > goto unlock;
> > }
> > - clk_enable(state->clock[CSIS_CLK_GATE]);
> > + ret = clk_enable(state->clock[CSIS_CLK_GATE]);
> > + if (ret)
> > + goto unlock;
>
> You should unwind the work done, so power off the phy and disble regulators.
Thank you for your advice. I will submit a v2 patch.
Additionally, I noticed a redundant space before the label "unlock," so I will
remove it as well.
-Jiasheng
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-22 19:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-21 21:05 [PATCH 2/2] media: camif-core: Add check for clk_enable() Jiasheng Jiang
2024-11-21 21:05 ` [PATCH 1/2] media: mipi-csis: " Jiasheng Jiang
2024-11-22 7:01 ` Krzysztof Kozlowski
2024-11-22 19:47 ` Jiasheng Jiang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®