--- a/kernel/eka/include/drivers/mmc.inl	Tue Sep 28 15:28:31 2010 +0100
+++ b/kernel/eka/include/drivers/mmc.inl	Mon Oct 04 12:03:52 2010 +0100
@@ -1094,7 +1094,7 @@
 	Command().iDataMemoryP = aMemoryP;
 	EnableDoubleBuffering(aNumBlocks);
 
-	iStackP->UnBlock(this, KMMCBlockOnMoreData, aError == KErrNone ? KMMCErrNone : KMMCErrGeneral);
+	UnBlock(KMMCBlockOnMoreData, aError == KErrNone ? KMMCErrNone : KMMCErrGeneral);
 	}
 
 inline TBool DMMCSession::RequestMoreData()
@@ -1119,7 +1119,7 @@
 	
 	if(Command().IsDoubleBuffered() && (Command().iBytesDone + Command().BufferLength() < Command().iTotalLength))
 		{
-		iStackP->Block(this, KMMCBlockOnMoreData);
+		Block(KMMCBlockOnMoreData);
 		iDataTransferCallback.CallBack();
 		return(ETrue);
 		}
@@ -1229,7 +1229,7 @@
  * @param aCardNumber The card number.
  * @return A pointer to the specified card.
  */
-	{return( (aCardNumber<iMaxCardsInStack) ? (iCardArray->CardP(aCardNumber)) : NULL );}
+	{return( (aCardNumber<MaxCardsInStack()) ? (iCardArray->CardP(aCardNumber)) : NULL );}
 
 inline DMMCSocket* DMMCStack::MMCSocket() const
 /**