Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faee816b authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

ACPI: don't enable control method power button as wakeup device when Fixed Power button is used 

don't enable control method power button as wakeup device
when Fixed Power button is used.

http://bugzilla.kernel.org/show_bug.cgi?id=10503



Tested-by: default avatarwalken@zoy.org <walken@zoy.org>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4330ed8e

drivers/acpi/scan.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -744,6 +744,16 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) 
	if (!acpi_match_device_ids(device, button_device_ids))

	if (!acpi_match_device_ids(device, button_device_ids))

		device->wakeup.flags.run_wake = 1;

		device->wakeup.flags.run_wake = 1;





	/*

	 * Don't set Power button GPE as run_wake

	 * if Fixed Power button is used

	 */

	if (!strcmp(device->pnp.hardware_id, "PNP0C0C") &&

		!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {

		device->wakeup.flags.run_wake = 0;

		device->wakeup.flags.valid = 0;

	}



      end:

      end:

	if (ACPI_FAILURE(status))

	if (ACPI_FAILURE(status))

		device->flags.wake_capable = 0;

		device->flags.wake_capable = 0;