--- a/kerneltest/e32test/iic/iic_psl/spi.cpp	Wed Dec 23 11:43:31 2009 +0000
+++ b/kerneltest/e32test/iic/iic_psl/spi.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -122,20 +122,12 @@
 	aDes.Copy((TUint8*)&caps,size);
     }
 
-
-DSimulatedSpiDevice* gDummyDevice;
-
 // supported channels for this implementation
 static DIicBusChannel* ChannelPtrArray[NUM_CHANNELS];
 
-
 //DECLARE_EXTENSION_WITH_PRIORITY(BUS_IMPLMENTATION_PRIORITY)	
 DECLARE_STANDARD_PDD()		// SPI test driver to be explicitly loaded as an LDD, not kernel extension
 	{
-	if(gDummyDevice == NULL)
-		gDummyDevice = new DSimulatedSpiDevice;
-	if(gDummyDevice == NULL)
-		return NULL;
 	SPI_PRINT(("\n\nSPI PDD, channel creation loop follows ...\n"));
 
 #ifndef STANDALONE_CHANNEL
@@ -200,7 +192,7 @@
 		return NULL;
 		}
 #endif
-	return gDummyDevice;
+	return new DSimulatedSpiDevice;
 	}
 
 #ifdef STANDALONE_CHANNEL