--- a/kernel/eka/drivers/pbus/mmc/session.cpp	Fri Aug 06 16:34:38 2010 +0100
+++ b/kernel/eka/drivers/pbus/mmc/session.cpp	Thu Aug 12 11:55:14 2010 +0100
@@ -464,6 +464,10 @@
 		return KErrNotReady;
 	    }
 
+	// Save the callers card pointer as some state machines 
+	// (e.g. ECIMLockUnlock, ECIMInitStackAfterUnlock) can change it
+	SaveCard();
+
 	SetupCIMControl(iSessionID);
 
 	iStackP->Add(this);