redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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 <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
zero-sugar-mainline-defconfig
Dinh Nguyen 2020-11-09 13:21:41 -06:00 committed by Philipp Zabel
parent 3bfe8933f9
commit 0d625a167b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/reset/reset-socfpga.c
View File

@ -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", &reg_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 ret;
release_region:
release_mem_region(res.start, size);
err_alloc:
kfree(data);