* [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable()
@ 2013-07-20 19:10 Fabio Estevam
2013-07-20 19:10 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
2013-07-22 8:09 ` [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Philipp Zabel
0 siblings, 2 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-07-20 19:10 UTC (permalink / raw)
To: k.debski; +Cc: m.chehab, kernel, linux-media, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Add missing 'if'
drivers/media/platform/coda.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index df4ada88..486db30 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1559,14 +1559,21 @@ static int coda_open(struct file *file)
list_add(&ctx->list, &dev->instances);
coda_unlock(ctx);
- clk_prepare_enable(dev->clk_per);
- clk_prepare_enable(dev->clk_ahb);
+ ret = clk_prepare_enable(dev->clk_per);
+ if (ret)
+ goto err;
+
+ ret = clk_prepare_enable(dev->clk_ahb);
+ if (ret)
+ goto err_clk_ahb;
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, "Created instance %d (%p)\n",
ctx->idx, ctx);
return 0;
+err_clk_ahb:
+ clk_disable_unprepare(dev->clk_per);
err:
v4l2_fh_del(&ctx->fh);
v4l2_fh_exit(&ctx->fh);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource()
2013-07-20 19:10 [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Fabio Estevam
@ 2013-07-20 19:10 ` Fabio Estevam
2013-07-22 8:09 ` [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Philipp Zabel
1 sibling, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-07-20 19:10 UTC (permalink / raw)
To: k.debski; +Cc: m.chehab, kernel, linux-media, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
When using devm_ioremap_resource(), we do not need to check the return value of
platform_get_resource(), so just remove it.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- None
drivers/media/platform/coda.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 486db30..f9a4b33 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -2039,11 +2039,6 @@ static int coda_probe(struct platform_device *pdev)
/* Get memory for physical registers */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res == NULL) {
- dev_err(&pdev->dev, "failed to get memory region resource\n");
- return -ENOENT;
- }
-
dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(dev->regs_base))
return PTR_ERR(dev->regs_base);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable()
2013-07-20 19:10 [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Fabio Estevam
2013-07-20 19:10 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
@ 2013-07-22 8:09 ` Philipp Zabel
1 sibling, 0 replies; 5+ messages in thread
From: Philipp Zabel @ 2013-07-22 8:09 UTC (permalink / raw)
To: Fabio Estevam; +Cc: k.debski, m.chehab, kernel, linux-media, Fabio Estevam
Hi Fabio,
Am Samstag, den 20.07.2013, 16:10 -0300 schrieb Fabio Estevam:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> clk_prepare_enable() may fail, so let's check its return value and propagate it
> in the case of error.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> ---
> Changes since v1:
> - Add missing 'if'
>
> drivers/media/platform/coda.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> index df4ada88..486db30 100644
> --- a/drivers/media/platform/coda.c
> +++ b/drivers/media/platform/coda.c
> @@ -1559,14 +1559,21 @@ static int coda_open(struct file *file)
> list_add(&ctx->list, &dev->instances);
> coda_unlock(ctx);
Now this list_add is not reverted in the error path, ...
>
> - clk_prepare_enable(dev->clk_per);
> - clk_prepare_enable(dev->clk_ahb);
> + ret = clk_prepare_enable(dev->clk_per);
> + if (ret)
> + goto err;
> +
> + ret = clk_prepare_enable(dev->clk_ahb);
> + if (ret)
> + goto err_clk_ahb;
... better move it down here.
> v4l2_dbg(1, coda_debug, &dev->v4l2_dev, "Created instance %d (%p)\n",
> ctx->idx, ctx);
>
> return 0;
>
> +err_clk_ahb:
> + clk_disable_unprepare(dev->clk_per);
> err:
> v4l2_fh_del(&ctx->fh);
> v4l2_fh_exit(&ctx->fh);
regards
Philipp
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] [media] coda: Check the return value from clk_prepare_enable()
@ 2013-07-20 18:48 Fabio Estevam
2013-07-20 18:48 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2013-07-20 18:48 UTC (permalink / raw)
To: k.debski; +Cc: m.chehab, kernel, linux-media, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/media/platform/coda.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index df4ada88..dd76228 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1559,14 +1559,20 @@ static int coda_open(struct file *file)
list_add(&ctx->list, &dev->instances);
coda_unlock(ctx);
- clk_prepare_enable(dev->clk_per);
- clk_prepare_enable(dev->clk_ahb);
+ ret = clk_prepare_enable(dev->clk_per);
+ if (ret)
+ goto err;
+
+ ret = clk_prepare_enable(dev->clk_ahb);
+ goto err_clk_ahb;
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, "Created instance %d (%p)\n",
ctx->idx, ctx);
return 0;
+err_clk_ahb:
+ clk_disable_unprepare(dev->clk_per);
err:
v4l2_fh_del(&ctx->fh);
v4l2_fh_exit(&ctx->fh);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource()
2013-07-20 18:48 [PATCH " Fabio Estevam
@ 2013-07-20 18:48 ` Fabio Estevam
2013-07-22 8:10 ` Philipp Zabel
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2013-07-20 18:48 UTC (permalink / raw)
To: k.debski; +Cc: m.chehab, kernel, linux-media, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
When using devm_ioremap_resource(), we do not need to check the return value of
platform_get_resource(), so just remove it.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/media/platform/coda.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index dd76228..236385f 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -2038,11 +2038,6 @@ static int coda_probe(struct platform_device *pdev)
/* Get memory for physical registers */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res == NULL) {
- dev_err(&pdev->dev, "failed to get memory region resource\n");
- return -ENOENT;
- }
-
dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(dev->regs_base))
return PTR_ERR(dev->regs_base);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource()
2013-07-20 18:48 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
@ 2013-07-22 8:10 ` Philipp Zabel
0 siblings, 0 replies; 5+ messages in thread
From: Philipp Zabel @ 2013-07-22 8:10 UTC (permalink / raw)
To: Fabio Estevam; +Cc: k.debski, m.chehab, kernel, linux-media, Fabio Estevam
Am Samstag, den 20.07.2013, 15:48 -0300 schrieb Fabio Estevam:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> When using devm_ioremap_resource(), we do not need to check the return value of
> platform_get_resource(), so just remove it.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> drivers/media/platform/coda.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> index dd76228..236385f 100644
> --- a/drivers/media/platform/coda.c
> +++ b/drivers/media/platform/coda.c
> @@ -2038,11 +2038,6 @@ static int coda_probe(struct platform_device *pdev)
>
> /* Get memory for physical registers */
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (res == NULL) {
> - dev_err(&pdev->dev, "failed to get memory region resource\n");
> - return -ENOENT;
> - }
> -
> dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(dev->regs_base))
> return PTR_ERR(dev->regs_base);
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-07-22 8:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-20 19:10 [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Fabio Estevam
2013-07-20 19:10 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
2013-07-22 8:09 ` [PATCH v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Philipp Zabel
-- strict thread matches above, loose matches on Subject: below --
2013-07-20 18:48 [PATCH " Fabio Estevam
2013-07-20 18:48 ` [PATCH 2/2] [media] coda: No need to check the return value of platform_get_resource() Fabio Estevam
2013-07-22 8:10 ` Philipp Zabel
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).