1 files changed, 6 insertions, 2 deletions
diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index 177a73bc78..7a7e7e3b44 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -605,8 +605,8 @@ S3Ready (
   @param ImageHandle   A handle for the image that is initializing this driver
   @param SystemTable   A pointer to the EFI system table
 
-  @retval EFI_SUCCESS:              Driver initialized successfully
-  @retval EFI_LOAD_ERROR:           Failed to Initialize or has been loaded
+  @retval EFI_SUCCESS               Driver initialized successfully
+  @retval EFI_UNSUPPORTED           Do not support ACPI S3
   @retval EFI_OUT_OF_RESOURCES      Could not allocate needed resources
 
 **/
@@ -619,6 +619,10 @@ InstallAcpiS3Save (
 {
   EFI_STATUS        Status;
 
+  if (!PcdGetBool (PcdAcpiS3Enable)) {
+    return EFI_UNSUPPORTED;
+  }
+
   if (!FeaturePcdGet(PcdPlatformCsmSupport)) {
     //
     // More memory for no CSM tip, because GDT need relocation