From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Fri, 16 Feb 2007 12:19:47 +0000 (+0100)
Subject: [AVR32] Warn, don't BUG if clk_disable is called too many times
X-Git-Tag: v2.6.21-rc1~93^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23cebe2287474720c2eb0673581056cfb285a69f;p=linux-2.6-omap-h63xx.git

[AVR32] Warn, don't BUG if clk_disable is called too many times

Print a helpful warning along with a stack dump if clk_disable is
called on a already-disabled clock. Remove the BUG_ON().

Extracted from a patch by David Brownell.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---

diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 3d0d1097389..49e7b12fe71 100644
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -63,7 +63,11 @@ EXPORT_SYMBOL(clk_enable);
 
 static void __clk_disable(struct clk *clk)
 {
-	BUG_ON(clk->users == 0);
+	if (clk->users == 0) {
+		printk(KERN_ERR "%s: mismatched disable\n", clk->name);
+		WARN_ON(1);
+		return;
+	}
 
 	if (--clk->users == 0 && clk->mode)
 		clk->mode(clk, 0);