p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

soc: brcmstb: Unmap sun_top_ctrl_base on errors 

Do not leak a ioremap()'d cookie around, unmaping it in case of errors

Fixes: cef4bafcea ("soc: brcmstb: add SoC driver to brcmstb")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Florian Fainelli 2016-04-25 16:08:09 -07:00 committed by Arnd Bergmann
parent d3829c1b84
commit 8d3fd357a2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/soc/brcmstb/common.c
View File

@ -51,6 +51,7 @@ static int __init brcmstb_soc_device_init(void)
struct soc_device *soc_dev;
struct device_node *sun_top_ctrl;
void __iomem *sun_top_ctrl_base;
int ret = 0;
sun_top_ctrl = of_find_matching_node(NULL, sun_top_ctrl_match);
if (!sun_top_ctrl)
@ -64,8 +65,10 @@ static int __init brcmstb_soc_device_init(void)
product_id = readl(sun_top_ctrl_base + 0x4);
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
if (!soc_dev_attr)
return -ENOMEM;
if (!soc_dev_attr) {
ret = -ENOMEM;
goto out;
}
soc_dev_attr->family = kasprintf(GFP_KERNEL, "%x",
family_id >> 28 ?
@ -83,9 +86,14 @@ static int __init brcmstb_soc_device_init(void)
kfree(soc_dev_attr->soc_id);
kfree(soc_dev_attr->revision);
kfree(soc_dev_attr);
return -ENODEV;
ret = -ENODEV;
goto out;
}
return 0;
out:
iounmap(sun_top_ctrl_base);
return ret;
}
arch_initcall(brcmstb_soc_device_init);