commit 32a00d274e877eab3ea7ab196b75c9be5170d25e
author Rafael J. Wysocki <rjw@sisk.pl> Thu Nov 25 00:05:17 2010 +0100
committer Len Brown <len.brown@intel.com> Wed Jan 12 04:48:43 2011 -0500
tree 0b7a515e8b2328e8cf8b22794cdf81ab19838b5d
parent 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5

ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes

acpi_power_get_inferred_state() should not update
device->power.state behind the back of its caller, so make it return
the state via a pointer instead.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/internal.h

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a212bfe..2cc0148 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -41,7 +41,7 @@
 int acpi_power_init(void);
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
-int acpi_power_get_inferred_state(struct acpi_device *device);
+int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;