aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 5c8c5e0449b6..18a2df38265d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -927,10 +927,10 @@ static void _am33xx_enable_module(struct omap_hwmod *oh)
927 */ 927 */
928static int _omap4_wait_target_disable(struct omap_hwmod *oh) 928static int _omap4_wait_target_disable(struct omap_hwmod *oh)
929{ 929{
930 if (!oh || !oh->clkdm) 930 if (!oh)
931 return -EINVAL; 931 return -EINVAL;
932 932
933 if (oh->_int_flags & _HWMOD_NO_MPU_PORT) 933 if (oh->_int_flags & _HWMOD_NO_MPU_PORT || !oh->clkdm)
934 return 0; 934 return 0;
935 935
936 if (oh->flags & HWMOD_NO_IDLEST) 936 if (oh->flags & HWMOD_NO_IDLEST)
@@ -2635,10 +2635,10 @@ static int _omap2_wait_target_ready(struct omap_hwmod *oh)
2635 */ 2635 */
2636static int _omap4_wait_target_ready(struct omap_hwmod *oh) 2636static int _omap4_wait_target_ready(struct omap_hwmod *oh)
2637{ 2637{
2638 if (!oh || !oh->clkdm) 2638 if (!oh)
2639 return -EINVAL; 2639 return -EINVAL;
2640 2640
2641 if (oh->flags & HWMOD_NO_IDLEST) 2641 if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm)
2642 return 0; 2642 return 0;
2643 2643
2644 if (!_find_mpu_rt_port(oh)) 2644 if (!_find_mpu_rt_port(oh))