Re: [PATCH] reset: socfpga: add error handling and release mem-region

[Philipp Zabel]

On Mon, 2020-11-02 at 13:57 -0600, Dinh Nguyen wrote:
> In case of an error, call release_mem_region when an error happens
> during allocation of resources. Also add error handling for the case
> that reset_controller_register fails.
> 
> Reported-by: kernel test robot 
> Reported-by: Dan Carpenter 
> Signed-off-by: Dinh Nguyen 
> ---
>  drivers/reset/reset-socfpga.c | 11 +--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
> index bdd984296196..af9041ec37c6 100644
> --- a/drivers/reset/reset-socfpga.c
> +++ b/drivers/reset/reset-socfpga.c
> @@ -44,7 +44,7 @@ static int a10_reset_init(struct device_node *np)
>   data->membase = ioremap(res.start, size);
>   if (!data->membase) {
>   ret = -ENOMEM;
> - goto err_alloc;
> + goto release_region;
>   }
>  
>   if (of_property_read_u32(np, "altr,modrst-offset", _offset))
> @@ -59,7 +59,14 @@ static int a10_reset_init(struct device_node *np)
>   data->rcdev.of_node = np;
>   data->status_active_low = true;
>  
> - return reset_controller_register(>rcdev);
> + ret = reset_controller_register(>rcdev);
> + if (ret)
> + pr_err("unable to register device\n");
> +
> + return 0;

Please don't return 0 if reset_controller_register() failed.

regards
Philipp

[PATCH] reset: socfpga: add error handling and release mem-region

[Dinh Nguyen]

In case of an error, call release_mem_region when an error happens
during allocation of resources. Also add error handling for the case
that reset_controller_register fails.

Reported-by: kernel test robot 
Reported-by: Dan Carpenter 
Signed-off-by: Dinh Nguyen 
---
 drivers/reset/reset-socfpga.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index bdd984296196..af9041ec37c6 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -44,7 +44,7 @@ static int a10_reset_init(struct device_node *np)
data->membase = ioremap(res.start, size);
if (!data->membase) {
ret = -ENOMEM;
-   goto err_alloc;
+   goto release_region;
}
 
if (of_property_read_u32(np, "altr,modrst-offset", _offset))
@@ -59,7 +59,14 @@ static int a10_reset_init(struct device_node *np)
data->rcdev.of_node = np;
data->status_active_low = true;
 
-   return reset_controller_register(>rcdev);
+   ret = reset_controller_register(>rcdev);
+   if (ret)
+   pr_err("unable to register device\n");
+
+   return 0;
+
+release_region:
+   release_mem_region(res.start, size);
 
 err_alloc:
kfree(data);
-- 
2.17.1