2017-04-11 03:41:09

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH] soc/tegra: flowctrl: Fix error handling

It is likely that returning returned by 'devm_ioremap_resource()' is
expected here instead of something related to 'base' which should be a
valid pointer at this point.

Fixes: 841fd94c43a4 ("soc/tegra: flowctrl: Add basic platform driver")

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/soc/tegra/flowctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/tegra/flowctrl.c b/drivers/soc/tegra/flowctrl.c
index 0e345c05fc65..5433cc7a043e 100644
--- a/drivers/soc/tegra/flowctrl.c
+++ b/drivers/soc/tegra/flowctrl.c
@@ -157,7 +157,7 @@ static int tegra_flowctrl_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
tegra_flowctrl_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(tegra_flowctrl_base))
- return PTR_ERR(base);
+ return PTR_ERR(tegra_flowctrl_base);

iounmap(base);

--
2.11.0


2017-04-11 07:15:50

by Jon Hunter

[permalink] [raw]
Subject: Re: [PATCH] soc/tegra: flowctrl: Fix error handling


On 11/04/17 04:40, Christophe JAILLET wrote:
> It is likely that returning returned by 'devm_ioremap_resource()' is
> expected here instead of something related to 'base' which should be a
> valid pointer at this point.
>
> Fixes: 841fd94c43a4 ("soc/tegra: flowctrl: Add basic platform driver")
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/soc/tegra/flowctrl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/soc/tegra/flowctrl.c b/drivers/soc/tegra/flowctrl.c
> index 0e345c05fc65..5433cc7a043e 100644
> --- a/drivers/soc/tegra/flowctrl.c
> +++ b/drivers/soc/tegra/flowctrl.c
> @@ -157,7 +157,7 @@ static int tegra_flowctrl_probe(struct platform_device *pdev)
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> tegra_flowctrl_base = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(tegra_flowctrl_base))
> - return PTR_ERR(base);
> + return PTR_ERR(tegra_flowctrl_base);
>
> iounmap(base);

Oops! Thanks for the fix.

Acked-by: Jon Hunter <[email protected]>

Cheers
Jon

--
nvpublic

2017-06-13 14:48:32

by Thierry Reding

[permalink] [raw]
Subject: Re: [PATCH] soc/tegra: flowctrl: Fix error handling

On Tue, Apr 11, 2017 at 05:40:41AM +0200, Christophe JAILLET wrote:
> It is likely that returning returned by 'devm_ioremap_resource()' is
> expected here instead of something related to 'base' which should be a
> valid pointer at this point.
>
> Fixes: 841fd94c43a4 ("soc/tegra: flowctrl: Add basic platform driver")
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/soc/tegra/flowctrl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thierry

Attachments:
(No filename) (511.00 B)
 signature.asc (833.00 B)
 Download all attachments