From 62f4b7f471a4b1037468d382f927c5061e5fa9ed Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 24 Jun 2010 14:19:52 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2036
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chcond.c   | 3 +--
 os/kernel/src/chqueues.c | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index c450b0c32..92e1a4eb4 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -17,8 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
-   Concepts and parts of this file are contributed by and Copyright (C) 2008
-   of Leon Woestenberg.
+   Concepts and parts of this file have been contributed by Leon Woestenberg.
  */
 
 /**
diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 84cbbed94..d1aa03cc6 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -126,6 +126,10 @@ msg_t chIQGetTimeout(InputQueue *iqp, systime_t time) {
   msg_t msg;
 
   chSysLock();
+  
+  if (iqp->q_notify)
+    iqp->q_notify();
+
   if ((msg = chSemWaitTimeoutS(&iqp->q_sem, time)) < RDY_OK) {
     chSysUnlock();
     return msg;
@@ -134,9 +138,6 @@ msg_t chIQGetTimeout(InputQueue *iqp, systime_t time) {
   if (iqp->q_rdptr >= iqp->q_top)
     iqp->q_rdptr = iqp->q_buffer;
 
-  if (iqp->q_notify)
-    iqp->q_notify();
-
   chSysUnlock();
   return b;
 }
-- 
cgit v1.2.3