Commit be6b6947 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  ACPI / PM: Avoid infinite recurrence while registering power resources
  PM / Wakeup: Fix initialization of wakeup-related device sysfs files
parents 0fd97ab4 7bed50c5

drivers/acpi/scan.c

+4 −0
Original line number Diff line number Diff line
@@ -943,6 +943,10 @@ static int acpi_bus_get_flags(struct acpi_device *device) 
	if (ACPI_SUCCESS(status))

		device->flags.lockable = 1;



	/* Power resources cannot be power manageable. */

	if (device->device_type == ACPI_BUS_TYPE_POWER)

		return 0;



	/* Presence of _PS0|_PR0 indicates 'power manageable' */

	status = acpi_get_handle(device->handle, "_PS0", &temp);

	if (ACPI_FAILURE(status))

drivers/base/power/main.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ void device_pm_init(struct device *dev) 
	dev->power.wakeup = NULL;

	spin_lock_init(&dev->power.lock);

	pm_runtime_init(dev);

	INIT_LIST_HEAD(&dev->power.entry);

}



/**

drivers/base/power/wakeup.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void device_set_wakeup_capable(struct device *dev, bool capable) 
	if (!!dev->power.can_wakeup == !!capable)

		return;



	if (device_is_registered(dev)) {

	if (device_is_registered(dev) && !list_empty(&dev->power.entry)) {

		if (capable) {

			if (wakeup_sysfs_add(dev))

				return;