From 31860bb00d5c921c5c53b22fe87299692860a29d Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Fri, 24 Dec 2010 19:56:28 +0100
Subject: [PATCH] --- yaml --- r: 227881 b: refs/heads/master c:
 213658516fd5e125eb7a97995f6cae8996f8015b h: refs/heads/master i:   227879:
 3c71f0c2a93cd10d56ddfc8fabd0d2cdfe9e10c6 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/platform/x86/thinkpad_acpi.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f7293488cb8..1c67ed09c2ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 466449cfe797b8a5d82d25d0e0e08426d8dfba19
+refs/heads/master: 213658516fd5e125eb7a97995f6cae8996f8015b
diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c
index f372dc7ae14e..a974ca383cb9 100644
--- a/trunk/drivers/platform/x86/thinkpad_acpi.c
+++ b/trunk/drivers/platform/x86/thinkpad_acpi.c
@@ -589,6 +589,7 @@ static int acpi_evalf(acpi_handle handle,
 		default:
 			printk(TPACPI_ERR "acpi_evalf() called "
 			       "with invalid format character '%c'\n", c);
+			va_end(ap);
 			return 0;
 		}
 	}