X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=c8c21be11ab48e25569b43a31aee148d7d89c6d1;hb=d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b;hp=dd4b80a9f1a986ff35b192655064db6db3b85883;hpb=0b99cb73105f0527c1c4096960796b8772343a39;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index dd4b80a..c8c21be 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu)
 {
 	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
 
+	if (!watchdog_enabled)
+		return;
+
 	watchdog_set_prio(SCHED_NORMAL, 0);
 	hrtimer_cancel(hrtimer);
 	/* disable the perf event */