* [PATCH next] media: raspberrypi: Do some cleanup in probe()
@ 2024-10-23 8:30 Dan Carpenter
2024-10-28 9:22 ` Tomi Valkeinen
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2024-10-23 8:30 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Raspberry Pi Kernel Maintenance, Mauro Carvalho Chehab,
Florian Fainelli, Broadcom internal kernel review list,
Sakari Ailus, Naushir Patuck, linux-media, linux-rpi-kernel,
linux-arm-kernel, linux-kernel, kernel-janitors
If devm_clk_get() fails then we need to free "cfe" before returning.
Fixes: 6edb685abb2a ("media: raspberrypi: Add support for RP1-CFE")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
index 045910de6c57..1da58b07c1d3 100644
--- a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
+++ b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
@@ -2343,9 +2343,11 @@ static int cfe_probe(struct platform_device *pdev)
/* TODO: Enable clock only when running. */
cfe->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(cfe->clk))
- return dev_err_probe(&pdev->dev, PTR_ERR(cfe->clk),
- "clock not found\n");
+ if (IS_ERR(cfe->clk)) {
+ ret = dev_err_probe(&pdev->dev, PTR_ERR(cfe->clk),
+ "clock not found\n");
+ goto err_cfe_put;
+ }
cfe->mdev.dev = &pdev->dev;
cfe->mdev.ops = &cfe_media_device_ops;
--
2.45.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH next] media: raspberrypi: Do some cleanup in probe()
2024-10-23 8:30 [PATCH next] media: raspberrypi: Do some cleanup in probe() Dan Carpenter
@ 2024-10-28 9:22 ` Tomi Valkeinen
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Valkeinen @ 2024-10-28 9:22 UTC (permalink / raw)
To: Dan Carpenter
Cc: Raspberry Pi Kernel Maintenance, Mauro Carvalho Chehab,
Florian Fainelli, Broadcom internal kernel review list,
Sakari Ailus, Naushir Patuck, linux-media, linux-rpi-kernel,
linux-arm-kernel, linux-kernel, kernel-janitors
Hi,
On 23/10/2024 11:30, Dan Carpenter wrote:
> If devm_clk_get() fails then we need to free "cfe" before returning.
>
> Fixes: 6edb685abb2a ("media: raspberrypi: Add support for RP1-CFE")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
> index 045910de6c57..1da58b07c1d3 100644
> --- a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
> +++ b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
> @@ -2343,9 +2343,11 @@ static int cfe_probe(struct platform_device *pdev)
>
> /* TODO: Enable clock only when running. */
> cfe->clk = devm_clk_get(&pdev->dev, NULL);
> - if (IS_ERR(cfe->clk))
> - return dev_err_probe(&pdev->dev, PTR_ERR(cfe->clk),
> - "clock not found\n");
> + if (IS_ERR(cfe->clk)) {
> + ret = dev_err_probe(&pdev->dev, PTR_ERR(cfe->clk),
> + "clock not found\n");
> + goto err_cfe_put;
> + }
>
> cfe->mdev.dev = &pdev->dev;
> cfe->mdev.ops = &cfe_media_device_ops;
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-28 9:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-23 8:30 [PATCH next] media: raspberrypi: Do some cleanup in probe() Dan Carpenter
2024-10-28 9:22 ` Tomi Valkeinen
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®