Index: NVDataMgmt.c
===================================================================
diff -u -r0164cd187647ce322bb19f5075387732af38d09a -r87837a30c01ccd74d05bb77c734cbbc25a045202
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0164cd187647ce322bb19f5075387732af38d09a)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 87837a30c01ccd74d05bb77c734cbbc25a045202)
@@ -1753,7 +1753,7 @@
     PROCESS_RECORD_SPECS_T  jobSpecs = RECORDS_SPECS [ job ];
 
     // Check if the fapi has finished
-    if ( FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady )
+    if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
     {
         // Check the integrity of data (the 16 bytes that were written to EEPROM should be read and be checked for each byte)
         if ( writtenRecordStatus == NVDATAMGMT_RECORD_NOT_CHECKED )
@@ -1821,7 +1821,7 @@
     PROCESS_RECORD_SPECS_T jobSpecs = RECORDS_SPECS [ job ];
 
     // Check if the write job is EEPROM or RTC RAM
-    if ( recordCurrentJob.memoryLocation == NVDATAMGMT_EEPROM && FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady )
+    if ( recordCurrentJob.memoryLocation == NVDATAMGMT_EEPROM && Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
     {
         U32 i;
 
@@ -1899,7 +1899,7 @@
     NVDATAMGMT_EXEC_STATE_T state = NVDATAMGMT_EXEC_STATE_ERASE_EEPROM;
     BOOL timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
 
-    if ( FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady || timeoutStatus == TRUE )
+    if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY || timeoutStatus == TRUE )
     {
         state = NVDATAMGMT_EXEC_STATE_IDLE;
     }
@@ -2621,7 +2621,7 @@
     {
         benignPolynomialCalRecord( record );
 
-        // Set the to FALSE since the record is not valid
+        // Set status to FALSE since the record is not valid
         status = FALSE;
     }