Add patches accepted for 2.6.28-rc1
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.28-rc1 / 0002-ACPI-thinkpad-acpi-trivial-fix-of-error-message.patch
blobfee490db24715f1b150859dc053712565fb5d2f6
1 From 4f778b92c9d8d87c670fc063c66edf1aa46f6f1c Mon Sep 17 00:00:00 2001
2 From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
3 Date: Sat, 18 Oct 2008 14:23:53 -0300
4 Subject: ACPI: thinkpad-acpi: trivial fix of error message
6 Trivial fix makes the error message match the code before it (ibm->driver
7 vs ibm->acpi-driver) better.
9 Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
10 Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
11 Signed-off-by: Len Brown <len.brown@intel.com>
12 ---
13 drivers/misc/thinkpad_acpi.c | 3 ++-
14 1 files changed, 2 insertions(+), 1 deletions(-)
16 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
17 index 1dcf066..6c9b6c8 100644
18 --- a/drivers/misc/thinkpad_acpi.c
19 +++ b/drivers/misc/thinkpad_acpi.c
20 @@ -582,7 +582,8 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
22 ibm->acpi->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
23 if (!ibm->acpi->driver) {
24 - printk(TPACPI_ERR "kzalloc(ibm->driver) failed\n");
25 + printk(TPACPI_ERR
26 + "failed to allocate memory for ibm->acpi->driver\n");
27 return -ENOMEM;
30 --
31 1.5.6.5