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

Commit 462af435 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-10503' into test

parents 63e065e5 faee816b

drivers/acpi/scan.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -751,6 +751,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;