Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / arch / avr32 / mach-at32ap / clock.c

diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 3d0d1097389f167ec48dca953e277f7b331ab5fa..00c435452d7e500e473b3cbbeb1b4f1d939d5659 100644 (file)
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006 Atmel Corporation
  *
- * Based on arch/arm/mach-at91rm9200/clock.c
+ * Based on arch/arm/mach-at91/clock.c
  *   Copyright (C) 2005 David Brownell
  *   Copyright (C) 2005 Ivan Kokshaysky
  *
@@ -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);