Moved the PeiS3ResumeState access when PeiS3ResumeState is not 0, this will fix K9...

Signed-off-by: Li Elvin <elvin.li@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13929 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
index 3bddda131681c9f8c550bfb14601d44f1f5c1e25..e671164a83e17bc16d7c44b57d27108a49778c00 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
@@ -69,12 +69,6 @@ S3BootScriptExecutorEntryFunction (
   //\r
   Status = S3BootScriptExecute ();\r
 \r
-  //\r
-  // Need report status back to S3ResumePeim. \r
-  // If boot script execution is failed, S3ResumePeim wil report the error status code.\r
-  //\r
-  PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;\r
-\r
   AsmWbinvd ();\r
 \r
   //\r
@@ -86,6 +80,11 @@ S3BootScriptExecutorEntryFunction (
   // We need turn back to S3Resume - install boot script done ppi and report status code on S3resume.\r
   //\r
   if (PeiS3ResumeState != 0) {\r
+    //\r
+    // Need report status back to S3ResumePeim. \r
+    // If boot script execution is failed, S3ResumePeim wil report the error status code.\r
+    //\r
+    PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;\r
     if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
       //\r
       // X64 S3 Resume\r