From: Rafael J. Wysocki Date: Thu, 14 Oct 2010 21:24:13 +0000 (+0200) Subject: ACPI / PM: Fix problems with acpi_pm_device_sleep_state() X-Git-Tag: v2.6.37-rc1~100^2~9^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761afb869f649ea23e2dea7bfe9b550d3a1b7631;p=pandora-kernel.git ACPI / PM: Fix problems with acpi_pm_device_sleep_state() There is a number of problems with acpi_pm_device_sleep_state() now. First, if _S0W is not defined, it prevents devices from being put into D3 by PCI runtime PM, which shouldn't happen. Second, it shouldn't use adev->wakeup.state.enabled, because if it's set, it only means that either the device is permanently enabled to wake up the system, or that it has been enabled to do that through /proc/acpi/wakeup. Finally, it should be compiled if CONFIG_PM_SLEEP is not set, so that PCI runtime PM works correctly in that case. Fix these problems. Reported-by: Matthew Garrett Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown --- Reading git-diff-tree failed