--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Mon Oct 25 11:46:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Wed Nov 03 10:49:35 2010 +0800
@@ -148,11 +148,7 @@
     for (TInt index = 0; index < aLogicalUnitCount; index++)
         {
         command = new (ELeave) TRetrieveDriveLetter(parameter, index);
-
-		CleanupStack::PushL(command);        
-		iSubCommandQueue.PushL(command);
-		CleanupStack::Pop(command);
-
+        iSubCommandQueue.PushL(command);
         }
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORRETRIEVEDRIVELETTERL_EXIT );
     }
@@ -166,9 +162,9 @@
     TMountLogicalUnit* command = new (ELeave) TMountLogicalUnit(
             parameter, aDrive, aLuNumber);
 	
-	CleanupStack::PushL(command);
+    CleanupStack::PushL(command);
     iSubCommandQueue.InsertAfterHeadL(command);
-	CleanupStack::Pop(command);
+    CleanupStack::Pop(command);
 
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORMOUNTINGLOGICALUNITL_EXIT );
     }
@@ -182,9 +178,9 @@
     TSaveLatestMountInfo* command = 
         new (ELeave) TSaveLatestMountInfo(parameter, aDrive, aLuNumber);
 	
-	CleanupStack::PushL(command);
+    CleanupStack::PushL(command);
     iSubCommandQueue.InsertAfterHeadL(command);
-	CleanupStack::Pop(command);
+    CleanupStack::Pop(command);
 
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORSAVELATESTMOUNTINFOL_EXIT );
     }
@@ -374,10 +370,7 @@
     
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TRegisterInterface* command = new (ELeave) TRegisterInterface(parameter);
-
-	CleanupStack::PushL(command);
     iSubCommandQueue.PushL(command);
-	CleanupStack::Pop(command);
 
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORADDINGUSBMSFUNCTIONL_EXIT );
     }
@@ -396,10 +389,7 @@
     THostMsSubCommandParam parameter(iServer, *this, *this, iIncomingEvent);
     TRemoveUsbMsDevice* removeMsDevice = new (ELeave) TRemoveUsbMsDevice(
             parameter);
-	
-	CleanupStack::PushL(removeMsDevice);
     iSubCommandQueue.PushL(removeMsDevice);
-	CleanupStack::Pop(removeMsDevice);
     
     OstTraceFunctionExit0( CDEVICEEVENTHANDLER_CREATESUBCMDFORREMOVINGUSBMSDEVICEL_EXIT );
     }

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp	Mon Oct 25 11:46:03 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp	Wed Nov 03 10:49:35 2010 +0800
@@ -152,9 +152,6 @@
     {
     OstTraceFunctionEntry0( TREGISTERINTERFACE_DOCANCELASYNCCMD_ENTRY );
 
-	TRequestStatus* status = &iHandler.Status();
-    User::RequestComplete(status, KErrCancel);
-
     if(iInterfaceNode)
         {
         iInterfaceNode->iUsbMsDevice.Remove();