--- a/kerneltest/e32test/dma/dmasim.cpp	Mon Mar 15 12:45:50 2010 +0200
+++ b/kerneltest/e32test/dma/dmasim.cpp	Wed Mar 31 23:38:45 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -371,7 +371,13 @@
 
 void DmacSim::StopEmulation()
 	{
-	Timer.Cancel();
+	// Ensure that timer really is cancelled.
+	TBool cancelled = EFalse;
+	do
+		{
+		cancelled = Timer.Cancel();
+		}
+	while(!cancelled);
 	}
 
 void DmacSim::TickCB(TAny*)