Index: NVDataMgmt.c
===================================================================
diff -u -r3901134947efa340fdc31dc7f2d64a48b2470236 -reee3415dea5c6e05d5de9d3e3d916de6e1146e0e
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3901134947efa340fdc31dc7f2d64a48b2470236)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision eee3415dea5c6e05d5de9d3e3d916de6e1146e0e)
@@ -1700,7 +1700,7 @@
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = ( specs.maxReadBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
-        Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+        Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
         currentTime = getMSTimerCount();
         state = NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD;
     }
@@ -1728,7 +1728,7 @@
         U08* bufferAddress  = specs.structAddressPtr;
         U32 maxBufferLength = ( specs.maxReadBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
-        Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+        Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
         currentTime = getMSTimerCount();
         state = NVDATAMGMT_SELF_TEST_STATE_READ_SYS_RECORD;
     }
@@ -2057,7 +2057,7 @@
         }
         else if ( ops == NVDATAMGMT_READ && location == NVDATAMGMT_EEPROM )
         {
-            Fapi_doMarginRead ( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength, Fapi_NormalRead );
+            Fapi_doMarginRead( (U32*)startAddress, (U32*)bufferAddress, maxBufferLength / EEPROM_OPS_SIZE_OF_CONVERTER, Fapi_NormalRead );
             state = NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM;
         }
         else if ( ops == NVDATAMGMT_WRITE && location == NVDATAMGMT_RTC )
@@ -2109,12 +2109,13 @@
         {
             currentTime = getMSTimerCount();
             U32 startAddress = jobSpecs.startAddress + recordAddressOffset;
+            U32 maxBufferLength = ( jobSpecs.maxWriteBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
 
             // Clear the buffer from the previous content
             memset( writtenRecordCheckBuffer, 0, sizeof(writtenRecordCheckBuffer));
 
             // Issue a FAPI read command but only the bytes that were written, so use maxWriteBufferSize
-            Fapi_doMarginRead ( (U32*)startAddress, (U32*)writtenRecordCheckBuffer, jobSpecs.maxWriteBufferSize, Fapi_NormalRead );
+            Fapi_doMarginRead( (U32*)startAddress, (U32*)writtenRecordCheckBuffer, maxBufferLength, Fapi_NormalRead );
 
             state = NVDATAMGMT_EXEC_STATE_VERIFY_EEPROM_WRITE;
         }