projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-soc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
[cascardo/linux.git]
/
drivers
/
clocksource
/
tcb_clksrc.c
diff --git
a/drivers/clocksource/tcb_clksrc.c
b/drivers/clocksource/tcb_clksrc.c
index
6ee9140
..
4da2af9
100644
(file)
--- a/
drivers/clocksource/tcb_clksrc.c
+++ b/
drivers/clocksource/tcb_clksrc.c
@@
-98,7
+98,8
@@
static int tc_shutdown(struct clock_event_device *d)
__raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
__raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
- clk_disable(tcd->clk);
+ if (!clockevent_state_detached(d))
+ clk_disable(tcd->clk);
return 0;
}