summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2013-08-03 21:13:22 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-03 21:13:22 +0200
commit593298e68a3a53bd2fe942244250dfef4d68d477 (patch)
tree9988d425ae6beb0c6326a61b791d97df89fd259b /drivers/acpi
parent7b4e0c4ac1809eab6fcfe6818ec8b70be79b41bc (diff)
downloadlinux-593298e68a3a53bd2fe942244250dfef4d68d477.tar.bz2
ACPI / PM: Add state information to error message in acpi_device_set_power()
The state information can be useful to know what the problem is when an error message about a device can not being set to a higher power state than its parent appeared, so this patch adds such state information for both the target state of the device and the current state of its parent. Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/device_pm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index beb9625e8458..59d3202f6b36 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -179,7 +179,9 @@ int acpi_device_set_power(struct acpi_device *device, int state)
}
if (device->parent && (state < device->parent->power.state)) {
dev_warn(&device->dev,
- "Cannot transition to a higher-powered state than parent\n");
+ "Cannot transition to power state %s for parent in %s\n",
+ acpi_power_state_string(state),
+ acpi_power_state_string(device->parent->power.state));
return -ENODEV;
}