| commit | 11f68686065a5634b09b374e988eb82c83a34d24 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Jun 24 19:52:54 2015 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Jun 24 19:52:54 2015 +0200 |
| tree | 7e900eafc70f58a0234a3079059a015f2b3d3733 | |
| parent | 43c9fad942b5afb9e03801c0721d83160fa5b0dd [diff] | |
| parent | 7bc10388ccdd79b3d20463151a1f8e7a590a775b [diff] |
Merge branch 'acpi-pnp' * acpi-pnp: ACPI / resources: free memory on error in add_region_before()
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index fcb7807..10561ce 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c
@@ -660,8 +660,10 @@ return -ENOMEM; error = request_range(start, end, space_id, flags, desc); - if (error) + if (error) { + kfree(reg); return error; + } reg->start = start; reg->end = end;