Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / timer / VirtualizeAlarmC.nc

diff --git a/tos/lib/timer/VirtualizeAlarmC.nc b/tos/lib/timer/VirtualizeAlarmC.nc
index e7c65d433ed434ca81228f431d941704d6180798..07180360d4ef584751a9d0697403f217b02f969a 100644 (file)
--- a/tos/lib/timer/VirtualizeAlarmC.nc
+++ b/tos/lib/timer/VirtualizeAlarmC.nc
@@ -166,7 +166,7 @@ implementation
 
   // extended interface
   async command bool Alarm.isRunning[uint8_t id]() {
-    return m.isset[id];
+    atomic return m.isset[id];
   }
 
   async command void Alarm.startAt[uint8_t id]( size_type t0, size_type dt ) {