diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:40:39 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:40:39 +0200 |
| commit | 36a557d1f48669c57f59e37d9334400a29e4e53c (patch) | |
| tree | 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 /drivers/acpi/thermal.c | |
| parent | Pull novell-bugzilla-156426 into release branch (diff) | |
| parent | [ACPI] drivers/acpi/video.c: fix error path NULL pointer dereference (diff) | |
| download | linux-36a557d1f48669c57f59e37d9334400a29e4e53c.tar.xz linux-36a557d1f48669c57f59e37d9334400a29e4e53c.zip | |
Pull trivial into release branch
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index fba9c230a84d..a29af58cb4cd 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -941,8 +941,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")); |