Index: NVDataMgmt.c
===================================================================
diff -u -r2e7123d1fa361b4bf15e20e5226a0c9366d443b2 -rb2e9f175df87c85369ee81816d07f374e023187b
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2e7123d1fa361b4bf15e20e5226a0c9366d443b2)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision b2e9f175df87c85369ee81816d07f374e023187b)
@@ -1206,7 +1206,6 @@
         memcpy( bufferAddress, nvDataStartPtr, bufferLength );
     }
 
-#ifndef SKIP_CAL_CHECK
     // Check if the non-volatile data is valid and if not raise the alarm
     if ( FALSE == isNVDataValid )
     {
@@ -1232,10 +1231,6 @@
         }
     }
 
-#else
-    isNVDataValid = TRUE;
-#endif
-
     return isNVDataValid;
 }