aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-28 13:20:38 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-28 13:20:38 +0000
commitce0845ef81f78144fc4edb5db710bdb1a10d0ba0 (patch)
tree893b856f42c28f76927423ce5ece2dbb888f6972 /os/kernel
parent7d9957e5ef13c814dfe08c10502492178a88794f (diff)
downloadChibiOS-ce0845ef81f78144fc4edb5db710bdb1a10d0ba0.tar.gz
ChibiOS-ce0845ef81f78144fc4edb5db710bdb1a10d0ba0.tar.bz2
ChibiOS-ce0845ef81f78144fc4edb5db710bdb1a10d0ba0.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1690 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel')
-rw-r--r--os/kernel/src/chcond.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index f0ec50c4f..372b9b2f1 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -149,8 +149,8 @@ msg_t chCondWaitS(CondVar *cp) {
"not owning a mutex");
mp = chMtxUnlockS();
- prio_insert(ctp, &cp->c_queue);
ctp->p_u.wtobjp = cp;
+ prio_insert(ctp, &cp->c_queue);
chSchGoSleepS(THD_STATE_WTCOND);
msg = ctp->p_u.rdymsg;
chMtxLockS(mp);
@@ -216,8 +216,8 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
"not owning a mutex");
mp = chMtxUnlockS();
- prio_insert(ctp, &cp->c_queue);
ctp->p_u.wtobjp = cp;
+ prio_insert(ctp, &cp->c_queue);
chSchGoSleepTimeoutS(THD_STATE_WTCOND, time);
msg = ctp->p_u.rdymsg;
chMtxLockS(mp);