summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2009-02-24 11:48:18 -0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-16 17:32:45 -0700
commit90a2a0f6ecc8bfe5994043661efb938583c0a2c1 (patch)
tree19a9994615d7bf8c12eb6c3868a92cd7ce2fb0ef
parent7f1c57aed4c5c3f3f61c82b4d7dc8bf8705df6f0 (diff)
downloadlinux-stable-90a2a0f6ecc8bfe5994043661efb938583c0a2c1.tar.gz
ACPI: fix broken usage of acpi_ut_get_node_name()
This issue was fixed indirectly in mainline by commit 60a4ce7f4148155d3f28eea4a213f7ee47cd57b7. acpi_ut_get_node_name() returns a four char fixed-size array, not NULL-terminated. This is the minimal fix for stable 2.6.28. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org Acked-by: Lin Ming <ming.m.lin@intel.com> Acked-by: Len Brown <lenb@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/acpi/power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index bb7d50dd2818..ad55db1899ac 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -151,7 +151,7 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
*state = (sta & 0x01)?ACPI_POWER_RESOURCE_STATE_ON:
ACPI_POWER_RESOURCE_STATE_OFF;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%4.4s] is %s\n",
acpi_ut_get_node_name(handle),
*state ? "on" : "off"));