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

Commit 2cebc5e2 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-15951' into release

parents c1db9d9b cb1cb178

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int acpi_button_add(struct acpi_device *device) 
		/* Button's GPE is run-wake GPE */

		acpi_enable_gpe(device->wakeup.gpe_device,

				device->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE_RUN);

				ACPI_GPE_TYPE_RUNTIME);

		device->wakeup.run_wake_count++;

		device->wakeup.state.enabled = 1;

	}
@@ -449,7 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type) 
	if (device->wakeup.flags.valid) {

		acpi_disable_gpe(device->wakeup.gpe_device,

				device->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE_RUN);

				ACPI_GPE_TYPE_RUNTIME);

		device->wakeup.run_wake_count--;

		device->wakeup.state.enabled = 0;

	}

drivers/acpi/wakeup.c

+7 −13
Original line number Diff line number Diff line
@@ -64,16 +64,13 @@ void acpi_enable_wakeup_device(u8 sleep_state) 
		struct acpi_device *dev =

			container_of(node, struct acpi_device, wakeup_list);



		if (!dev->wakeup.flags.valid)

			continue;



		if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)

		if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled

		    || sleep_state > (u32) dev->wakeup.sleep_state)

			continue;



		/* The wake-up power should have been enabled already. */

		acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_ENABLE);

		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE);

	}

}
@@ -96,6 +93,8 @@ void acpi_disable_wakeup_device(u8 sleep_state) 
		    || (sleep_state > (u32) dev->wakeup.sleep_state))

			continue;



		acpi_disable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE);

		acpi_disable_wakeup_device_power(dev);

	}

}
@@ -109,12 +108,7 @@ int __init acpi_wakeup_device_init(void) 
		struct acpi_device *dev = container_of(node,

						       struct acpi_device,

						       wakeup_list);

		/* In case user doesn't load button driver */

		if (!dev->wakeup.flags.always_enabled ||

		    dev->wakeup.state.enabled)

			continue;

 		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

 				ACPI_GPE_TYPE_WAKE);

		if (dev->wakeup.flags.always_enabled)

			dev->wakeup.state.enabled = 1;

	}

	mutex_unlock(&acpi_device_lock);