aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 752969ff9de0..d78c12e7cb5e 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3318,16 +3318,17 @@ int omap_hwmod_enable(struct omap_hwmod *oh)
3318 */ 3318 */
3319int omap_hwmod_idle(struct omap_hwmod *oh) 3319int omap_hwmod_idle(struct omap_hwmod *oh)
3320{ 3320{
3321 int r;
3321 unsigned long flags; 3322 unsigned long flags;
3322 3323
3323 if (!oh) 3324 if (!oh)
3324 return -EINVAL; 3325 return -EINVAL;
3325 3326
3326 spin_lock_irqsave(&oh->_lock, flags); 3327 spin_lock_irqsave(&oh->_lock, flags);
3327 _idle(oh); 3328 r = _idle(oh);
3328 spin_unlock_irqrestore(&oh->_lock, flags); 3329 spin_unlock_irqrestore(&oh->_lock, flags);
3329 3330
3330 return 0; 3331 return r;
3331} 3332}
3332 3333
3333/** 3334/**
@@ -3340,16 +3341,17 @@ int omap_hwmod_idle(struct omap_hwmod *oh)
3340 */ 3341 */
3341int omap_hwmod_shutdown(struct omap_hwmod *oh) 3342int omap_hwmod_shutdown(struct omap_hwmod *oh)
3342{ 3343{
3344 int r;
3343 unsigned long flags; 3345 unsigned long flags;
3344 3346
3345 if (!oh) 3347 if (!oh)
3346 return -EINVAL; 3348 return -EINVAL;
3347 3349
3348 spin_lock_irqsave(&oh->_lock, flags); 3350 spin_lock_irqsave(&oh->_lock, flags);
3349 _shutdown(oh); 3351 r = _shutdown(oh);
3350 spin_unlock_irqrestore(&oh->_lock, flags); 3352 spin_unlock_irqrestore(&oh->_lock, flags);
3351 3353
3352 return 0; 3354 return r;
3353} 3355}
3354 3356
3355/* 3357/*