summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:11:50 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:11:50 -0500
commit08e4a10ec82faf5ba67c8d0115b7bc9e58071555 (patch)
treebe31751f933ea26d8e7edb592a19584c3ff50679 /drivers/acpi/power.c
parent4559b438225b01942e1661759db0df55883b1bc0 (diff)
parentb1028c545ced13590dd9a9a8086543aef26c7187 (diff)
downloadlinux-08e4a10ec82faf5ba67c8d0115b7bc9e58071555.tar.gz
linux-08e4a10ec82faf5ba67c8d0115b7bc9e58071555.tar.bz2
linux-08e4a10ec82faf5ba67c8d0115b7bc9e58071555.zip
Pull bugzilla-7570 into release branch
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 00d6118ff1ef..1ef338545dfe 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -455,6 +455,10 @@ int acpi_power_transition(struct acpi_device *device, int state)
goto end;
}
+ if (device->power.state == state) {
+ goto end;
+ }
+
/*
* Then we dereference all power resources used in the current list.
*/