Merge branch 'acpi-pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 24 Jun 2015 17:52:54 +0000 (19:52 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 24 Jun 2015 17:52:54 +0000 (19:52 +0200)
* acpi-pnp:
  ACPI / resources: free memory on error in add_region_before()

drivers/acpi/resource.c

index fcb7807ea8b73de79163bb99c20091f4b202da0d..10561ce16ed135165cdbc8e558cb2aaea263d13b 100644 (file)
@@ -660,8 +660,10 @@ static int add_region_before(u64 start, u64 end, u8 space_id,
                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;