Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier
2012-09-02 11:45:38 +02:00
+2 -2
View File
@@ -104,8 +104,8 @@ int work_cancel(struct work_s *work)
flags = irqsave(); flags = irqsave();
if (work->worker != NULL) if (work->worker != NULL)
{ {
DEBUGASSERT(work->dq.flink || (FAR dq_entry_t *)work == g_work.head); DEBUGASSERT(work->dq.blink || (FAR dq_entry_t *)work == g_work.head);
DEBUGASSERT(work->dq.blink || (FAR dq_entry_t *)work == g_work.tail); DEBUGASSERT(work->dq.flink || (FAR dq_entry_t *)work == g_work.tail);
dq_rem((FAR dq_entry_t *)work, &g_work); dq_rem((FAR dq_entry_t *)work, &g_work);
work->worker = NULL; work->worker = NULL;