diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
| commit | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (patch) | |
| tree | f901bdcb5b20e93261cf9cf324ebbcf3fd24ce58 /drivers/acpi/bus.c | |
| parent | 9d5ae7cd6cb9ead43336fec1094184d1dc740fbd (diff) | |
| parent | 345f79b3de7f6d651e4dba794af7c7303bdfd649 (diff) | |
Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 9749980ca6c..d1e06c182cd 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -227,7 +227,7 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state) acpi_status status = AE_OK; char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' }; - if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3)) + if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) return -EINVAL; /* Make sure this is a valid target state */ |