diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 22:20:00 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 22:20:00 (GMT) |
commit | be6b694713740cea4610754171deec2db9cd668b (patch) | |
tree | 765680b0996f8af1d4263fa83daeb58935238841 /drivers/acpi/scan.c | |
parent | 0fd97ab48971735e38677cfdab64e4db581530f8 (diff) | |
parent | 7bed50c5edf5cba8dd515a31191cbfb6065ddc85 (diff) | |
download | linux-fsl-qoriq-be6b694713740cea4610754171deec2db9cd668b.tar.xz |
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
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index b136c9c..449c556 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -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)) |