X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fclocksource%2Ftcb_clksrc.c;h=4da2af9694a23b267cebdfa52da624e9f43b61fe;hb=ffee25e68d518aed3a505543355bff1d961159ff;hp=6ee91401918eba99a33c67b554da853747a0c5fa;hpb=4bde961e5245bb37dab4831107bbed23e433d55a;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 6ee91401918e..4da2af9694a2 100644
--- 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;
 }