summaryrefslogtreecommitdiff
path: root/nuttx/sched/wd_cancel.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-07 15:48:01 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-07 15:48:01 +0000
commit14d0a961ecf430c882eae8d7c7d66ba420c13403 (patch)
tree47435a2e441745acfa63f5262cd85fb5b8c3f7c4 /nuttx/sched/wd_cancel.c
parent99a001eab90e0b2058b969545396018239f1ee2b (diff)
downloadpx4-nuttx-14d0a961ecf430c882eae8d7c7d66ba420c13403.tar.gz
px4-nuttx-14d0a961ecf430c882eae8d7c7d66ba420c13403.tar.bz2
px4-nuttx-14d0a961ecf430c882eae8d7c7d66ba420c13403.zip
Drastic measures to work around missed interrupts -- must be a better way
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1860 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/wd_cancel.c')
-rw-r--r--nuttx/sched/wd_cancel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/sched/wd_cancel.c b/nuttx/sched/wd_cancel.c
index 0a22edd5d..9bdeafcf8 100644
--- a/nuttx/sched/wd_cancel.c
+++ b/nuttx/sched/wd_cancel.c
@@ -1,7 +1,7 @@
/****************************************************************************
* wd_cancel.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -98,9 +98,9 @@ STATUS wd_cancel (WDOG_ID wdid)
saved_state = irqsave();
- /* Make sure that the the watchdog is still active */
+ /* Make sure that the watchdog is initialed (non-NULL) and is still active */
- if (wdid->active)
+ if (wdid && wdid->active)
{
/* Search the g_wdactivelist for the target FCB. We can't use sq_rem
* to do this because there are additional operations that need to be