diff options
author | Tony Lindgren <tony@atomide.com> | 2017-11-28 07:06:34 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 07:06:34 -0800 |
commit | 2db57789e6612ce0cf2fcbb577a1c8307b708566 (patch) | |
tree | dd9f9e3dffabbf5cb932fcf5055ab329ca940fa0 /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
parent | f0c96c6d40312b1a76cd36709dc3eb5948c1b97f (diff) | |
parent | e9a9bb4e4779ca74cb52a6e2f8acbc0881d3bb18 (diff) | |
download | blackbird-op-linux-2db57789e6612ce0cf2fcbb577a1c8307b708566.tar.gz blackbird-op-linux-2db57789e6612ce0cf2fcbb577a1c8307b708566.zip |
Merge branch 'soc-fixes' into omap-for-v4.15/fixes
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 9cfba4125d63..d2106ae4410a 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -3107,7 +3107,7 @@ int __init omap3xxx_hwmod_init(void) int r; struct omap_hwmod_ocp_if **h = NULL, **h_gp = NULL, **h_sham = NULL; struct omap_hwmod_ocp_if **h_aes = NULL; - struct device_node *bus = NULL; + struct device_node *bus; unsigned int rev; omap_hwmod_init(); @@ -3167,18 +3167,14 @@ int __init omap3xxx_hwmod_init(void) if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) { r = omap_hwmod_register_links(h_sham); - if (r < 0) { - of_node_put(bus); - return r; - } + if (r < 0) + goto put_node; } if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) { r = omap_hwmod_register_links(h_aes); - if (r < 0) { - of_node_put(bus); - return r; - } + if (r < 0) + goto put_node; } of_node_put(bus); @@ -3229,4 +3225,8 @@ int __init omap3xxx_hwmod_init(void) r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs); return r; + +put_node: + of_node_put(bus); + return r; } |