Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 0 insertions, 11 deletions

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 363ca82a2..addff24cf 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -855,17 +855,6 @@ CFormPkg::DeclarePendingQuestion (
       // Get VarStoreType

       //

       ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId);

-      if (ReturnCode == VFR_RETURN_UNDEFINED) {

-        lCVfrDataStorage.DeclareBufferVarStore (

-                           FName, 

-                           LocalFormSetGuid, 

-                           &lCVfrVarDataTypeDB, 

-                           FName,

-                           EFI_VARSTORE_ID_INVALID,

-                           FALSE

-                           );

-        ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId, LocalFormSetGuid); 

-      }

       if (ReturnCode != VFR_RETURN_SUCCESS) {

         gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined");

         return ReturnCode;