git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 ecbd4a21e432204090e703bf5dbb139afa35ebbc..00c435452d7e500e473b3cbbeb1b4f1d939d5659 100644
(file)
--- 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);