From 94be8b1faae4e6ebf856836931c6883a1f5f0ce0 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Wed, 8 Mar 2006 22:12:00 -0500
Subject: [PATCH] --- yaml --- r: 29128 b: refs/heads/master c:
 fdc136ccd3332938e989439c025c363f8479f3e6 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/thermal.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51871d45b203..147ba9c37b68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1f9e65e2085e0a87f28a4d5a8ae43b32c087f24
+refs/heads/master: fdc136ccd3332938e989439c025c363f8479f3e6
diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c
index 19f3ea48475e..d0b44ce2ec5a 100644
--- a/trunk/drivers/acpi/thermal.c
+++ b/trunk/drivers/acpi/thermal.c
@@ -942,8 +942,10 @@ acpi_thermal_write_trip_points(struct file *file,
 	memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);
 
 	active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
-	if (!active)
+	if (!active) {
+		kfree(limit_string);
 		return_VALUE(-ENOMEM);
+	}
 
 	if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n"));