diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:50 -0500 |
| commit | 08e4a10ec82faf5ba67c8d0115b7bc9e58071555 (patch) | |
| tree | be31751f933ea26d8e7edb592a19584c3ff50679 /drivers/acpi/power.c | |
| parent | 4559b438225b01942e1661759db0df55883b1bc0 (diff) | |
| parent | b1028c545ced13590dd9a9a8086543aef26c7187 (diff) | |
Pull bugzilla-7570 into release branch
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 4 |
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) | |||
| 455 | goto end; | 455 | goto end; |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | if (device->power.state == state) { | ||
| 459 | goto end; | ||
| 460 | } | ||
| 461 | |||
| 458 | /* | 462 | /* |
| 459 | * Then we dereference all power resources used in the current list. | 463 | * Then we dereference all power resources used in the current list. |
| 460 | */ | 464 | */ |