--- a/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevicethread.cpp	Wed Sep 15 13:42:27 2010 +0300
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/controller/cusbhostmsdevicethread.cpp	Wed Oct 13 16:04:24 2010 +0300
@@ -173,16 +173,11 @@
         {
         if (iUsbHostMsDevice->IsSuspended())
             {
-
-            RMessage2 msg = iRMessage2[iDequeueIndex];      
-            if (msg.Function() != EUsbHostMsSuspendLun)
-                {
-                // request resume 
-                Unlock();
-                iUsbHostMsDevice->Resume(iStatus);
-                SetActive();
-                return;
-                }            
+            // request resume 
+            Unlock();
+            iUsbHostMsDevice->Resume(iStatus);
+            SetActive();
+            return;
             }
         }
 
@@ -314,11 +309,8 @@
 		return;
 	case EUsbHostMsUnRegisterInterface:
 		// Check whether all luns have got uninitialised. 
-        if (iUsbHostMsDevice)
-            {
-            for(TInt i = 0, j = iUsbHostMsDevice->GetMaxLun(); i <= j; i++)
-                TRAP_IGNORE(iUsbHostMsDevice->RemoveLunL(i));
-            }
+		for(TInt i = 0, j = iUsbHostMsDevice->GetMaxLun(); i <= j; i++)
+			TRAP_IGNORE(iUsbHostMsDevice->RemoveLunL(i));
 		TRAP(ret, UnRegisterInterfaceL(aMessage));
 		break;
 	case EUsbHostMsRegisterLun: