From 0b2fbd7a2ca801f5c3f8a6f587b44fe032f71591 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 21 Aug 2015 12:33:14 -0600 Subject: [PATCH] Fix a DEBUGASSERTion --- arch | 2 +- configs | 2 +- sched/wdog/wd_create.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch b/arch index 94705f285e..b2709988e6 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 94705f285e98a1ec5ca66027be01eff2e1189e27 +Subproject commit b2709988e66303b69358f7b7a910905a6a7ff888 diff --git a/configs b/configs index e3f37812a9..fda2b22665 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit e3f37812a9a7595a7ddab1a625ebe857d104beb2 +Subproject commit fda2b2266521c5cf312aa37ed3c2cd03a4a5c1db diff --git a/sched/wdog/wd_create.c b/sched/wdog/wd_create.c index f4b3962b72..db303d1627 100644 --- a/sched/wdog/wd_create.c +++ b/sched/wdog/wd_create.c @@ -115,18 +115,18 @@ WDOG_ID wd_create (void) /* Did we get one? */ - if (wdog) + if (wdog != NULL) { /* Yes.. decrement the count of free, pre-allocated timers (all * with interrupts disabled). */ - DEBUGASSERT(g_wdnfree > 0 && wdog != NULL); + DEBUGASSERT(g_wdnfree > 0); g_wdnfree--; /* Clear the forward link and all flags */ - wdog->next = NULL; + wdog->next = NULL; wdog->flags = 0; } else