reset: socfpga: add error handling and release mem-region
PATCH 1/1 reset: socfpga: add error handling and release mem-region
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 <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Dinh Nguyen <[email protected]>
--- drivers/reset/reset-socfpga.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/reset/reset-socfpga.c +9 -2
@@ -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 (&data->rcdev); + ret =reset_controller_register (&data->rcdev); +if (ret) +pr_err ("unable to register device\n" ); + +return 0 ; + +release_region: +release_mem_region (res.start, size); err_alloc:kfree (data);
Signature · 1 line
2.17.1
Philipp Zabel
maintainerQuoted 25 lines · Dinh Nguyen
In case of an error, call
release_mem_regionwhen an error happens during allocation of resources. Also add error handling for the case thatreset_controller_registerfails.Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Dinh Nguyen <[email protected]>--- drivers/reset/reset-socfpga.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/reset/reset-socfpga.c +1
-1@@ -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))
drivers/reset/reset-socfpga.c static int a10_reset_init(struct device_node *np) · line 66
Quoted 9 lines
drivers/reset/reset-socfpga.c +5
-1@@ -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 (&data->rcdev); + ret =reset_controller_register (&data->rcdev); +if (ret) +pr_err ("unable to register device\n" ); + +return 0 ;
Please don't return 0 if reset_controller_register() failed.
regards
Philipp