Merge tag 'acpi-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / arch / x86 / platform / efi / quirks.c

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 097cb09d917b1f826c13d6fb498115a2dd690d31..4480c06cade78d663f18db8ef09ff3db723dc1fe 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -371,5 +371,5 @@ bool efi_reboot_required(void)
 
 bool efi_poweroff_required(void)
 {
-       return !!acpi_gbl_reduced_hardware;
+       return acpi_gbl_reduced_hardware || acpi_no_s5;
 }