From c5875957aec84c41b08d572c28fc9ffa2c3532d1 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 15 Mar 2012 13:24:31 -0500 Subject: [PATCH] --- yaml --- r: 298723 b: refs/heads/master c: 0eb4fd9b3e4d08973f7f086dbdb14a0ad5c3d76d h: refs/heads/master i: 298721: a6375b835edce86958ea30be3c3fed756822200c 298719: a622044e2c2e0b3ee744d9fd4e4765542959527b v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/clock.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fa873c0d635..7f35f47b8719 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac387330a67635b4e4b946416e792bc9dd4b8f05 +refs/heads/master: 0eb4fd9b3e4d08973f7f086dbdb14a0ad5c3d76d diff --git a/trunk/arch/arm/plat-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c index 56b6f8b7053e..8506cbb7fea4 100644 --- a/trunk/arch/arm/plat-omap/clock.c +++ b/trunk/arch/arm/plat-omap/clock.c @@ -441,6 +441,8 @@ static int __init clk_disable_unused(void) return 0; pr_info("clock: disabling unused clocks to save power\n"); + + spin_lock_irqsave(&clockfw_lock, flags); list_for_each_entry(ck, &clocks, node) { if (ck->ops == &clkops_null) continue; @@ -448,10 +450,9 @@ static int __init clk_disable_unused(void) if (ck->usecount > 0 || !ck->enable_reg) continue; - spin_lock_irqsave(&clockfw_lock, flags); arch_clock->clk_disable_unused(ck); - spin_unlock_irqrestore(&clockfw_lock, flags); } + spin_unlock_irqrestore(&clockfw_lock, flags); return 0; }