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

ARM: bcm: err, don't BUG() on SMC init failures 

Several conditions in bcm_kona_smc_init() are handled with BUG_ON().
That function is capable of returning an error, so do that instead.

Also, don't assume of_get_address() returns a valid pointer.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
This commit is contained in:
Alex Elder 2014-04-21 16:53:03 -05:00 committed by Matt Porter
parent e80eef33f4
commit 5c4cee2fe8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/mach-bcm/bcm_kona_smc.c
View File

@ -45,6 +45,7 @@ static const struct of_device_id bcm_kona_smc_ids[] __initconst = {
int __init bcm_kona_smc_init(void)
{
struct device_node *node;
const __be32 *prop_val;
/* Read buffer addr and size from the device tree node */
node = of_find_matching_node(NULL, bcm_kona_smc_ids);
@ -52,12 +53,17 @@ int __init bcm_kona_smc_init(void)
return -ENODEV;
/* Don't care about size or flags of the DT node */
bridge_data.buffer_addr =
be32_to_cpu(*of_get_address(node, 0, NULL, NULL));
BUG_ON(!bridge_data.buffer_addr);
prop_val = of_get_address(node, 0, NULL, NULL);
if (!prop_val)
return -EINVAL;
bridge_data.buffer_addr = be32_to_cpu(*prop_val);
if (!bridge_data.buffer_addr)
return -EINVAL;
bridge_data.bounce = of_iomap(node, 0);
BUG_ON(!bridge_data.bounce);
if (!bridge_data.bounce)
return -ENOMEM;
bridge_data.initialized = 1;