Pull bugzilla-7570 into release branch

[powerpc.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 00d6118..1ef3385 100644 (file)
--- 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.
         */