aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index c3276436b0ae..bb6eb1efb1b7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3208,18 +3208,14 @@ int __init omap3xxx_hwmod_init(void)
3208 3208
3209 if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) { 3209 if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {
3210 r = omap_hwmod_register_links(h_sham); 3210 r = omap_hwmod_register_links(h_sham);
3211 if (r < 0) { 3211 if (r < 0)
3212 of_node_put(bus); 3212 goto put_node;
3213 return r;
3214 }
3215 } 3213 }
3216 3214
3217 if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) { 3215 if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) {
3218 r = omap_hwmod_register_links(h_aes); 3216 r = omap_hwmod_register_links(h_aes);
3219 if (r < 0) { 3217 if (r < 0)
3220 of_node_put(bus); 3218 goto put_node;
3221 return r;
3222 }
3223 } 3219 }
3224 of_node_put(bus); 3220 of_node_put(bus);
3225 3221
@@ -3270,4 +3266,8 @@ int __init omap3xxx_hwmod_init(void)
3270 r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs); 3266 r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs);
3271 3267
3272 return r; 3268 return r;
3269
3270put_node:
3271 of_node_put(bus);
3272 return r;
3273} 3273}